Merge resolution: 1080p
Merge branch 'master' of https://github.com/iburinoc/LifeSim

Conflicts:
	src/life/threedee/Camera.java
	src/life/threedee/game/Player.java