fixed line length being >72
Merge branch 'master' of https://github.com/Pancia/CMPS104A.F14

Conflicts:
	asg5/code_generator.cc