Added the template of how everything should look, the stuff we did just after 332 test
Merge branch 'master' of https://github.com/MarkFouche/cos301_2014_g8