added to Main()
Merge branch 'master' of https://github.com/gundermanc/code-brawl

Conflicts:
	src/com/etcz/codebrawl/Main.java
	src/com/etcz/codebrawl/Player.java
	src/com/etcz/codebrawl/Wall.java