correct merge error
fixed .classpath
Added light entity
Append to added light entity
fixed gitignore again
a
update
a
added specular lighting
Merge branch 'status'

Conflicts:
	ThreeDGame/.gitignore
	ThreeDGame/src/engineTester/MainGameLoop.java
	ThreeDGame/src/entities/Light.java
	ThreeDGame/src/renderEngine/Loader.java
	ThreeDGame/src/shaders/StaticShader.java
	ThreeDGame/src/shaders/fragmentShader.txt
	ThreeDGame/src/shaders/vertexShader.txt