Initial Project 2 Commit

Initial Project 2 commit!
Merge branch 'master' of https://github.com/g06034/SDI-Projects

Conflicts:
	sdi-project21/battle_christopher_assignment21.js
	sdi-project21/sdi-project21.html