Commits in ties454-2016-assignment2/francarr:master