firstView

firstView
Merge branch 'master' of https://github.com/naTiexu/TeamKalarba

Conflicts:
	src/javaGame/JavaGame.java