UPDATE
Merge branch 'master' of https://github.com/MarkFouche/cos301_2014_g1

Conflicts:
	SquirrelMarking/SquirrelMarking/urls.py