Merge branch 'master' of https://github.com/ryukiri/platform_project

Conflicts:
	src/GameBoard.java
GameBoard: derp