Floor
Merge branch 'MiliterBranch'

Conflicts:
	src/mygame/Main.java
floor