Smashed some bugs
Merge branch 'master' of https://github.com/MarkFouche/cos301_2014_g1
Fixed missing comma