Improved terrain and stuffs
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ourgame/Level.java
	src/ourgame/Player.java
	src/ourgame/Terrain.java