fixins
Merge branch 'master' of github.com:ANewHope/GitExerciseInClass