Gotta commit to pull
Merge branch 'master' of git@github.com:trudeaujt/CSCD454Final.git

Conflicts:
	DesPatProj/bin/Game.class
	DesPatProj/bin/NullCommand.class
	DesPatProj/src/Game.java