Update .gitignore
Merge branch 'master' of https://github.com/pschoeller/ThreeDGame.git
Delete .classpath
commit
Merge branch 'master' of https://github.com/pschoeller/ThreeDGame
Merge branch 'master' of https://github.com/pschoeller/ThreeDGame

Conflicts:
	ThreeDGame/.classpath
	ThreeDGame/src/entities/Camera.java