commit to pull
Merge branch 'dev' of https://github.com/CSc436/Project-4x into dev

Conflicts:
	war/game.html
Merge branch 'dev' of https://github.com/CSc436/Project-4x.git into dev
Merge branch 'dev' of https://github.com/CSc436/Project-4x into dev
Completed callbacks in GameInterface
- Getting null pointer exceptions; only consequence is that sidebar
doesn't get filled
- Doesn't impact game performance otherwise