minor style tweaks
Merge branch 'master' of https://github.com/HarrieO/cpp

Conflicts:
	assignment2/assign2_2/assign2_2
	assignment2/assign2_2/assign2_2.c
	assignment2/assign2_2/assign2_2.o
	assignment2/assign2_2/timer.o