Nom

Nothing
Merge branch 'master' of https://github.com/g06034/SDI-Projects

Conflicts:
	Battle_Christopher_assignment2.js
	sdi-project2.html