Good shit, structs should be taken care of.
Merge branch 'master' of https://github.com/Pancia/CMPS104A.F14

Conflicts:
	asg4/test.oc