saving files before updating line endings
updated gitignore for eclipse stuff
updated gitignore for eclipse stuff
Merge branch 'master' of https://github.com/xysmas/lamegame
updated gitignore for .settings folders
cleaned out git cache and added bin/ to ignore
Fix broken png files
Merge pull request #8 from xysmas/png-fix

Fix broken png files
Merge branch 'graphicsTestingContinued' of https://github.com/xysmas/lamegame into graphicsTestingContinued
Paige's line endings are still messed up in here, trying to merge upstream
updates.

Conflicts:
	.classpath
	bin/.gitignore
	src/engineTeter/MainGameLoop.java
	src/renderEnigne/DisplayManager.java
	src/renderEnigne/OBJLoader.java
	src/shaders/ShaderProgram.java
	src/shaders/StaticShader.java
	src/shaders/fragmentShader.txt
	src/shaders/vertexShader.txt
	src/textures/ModelTexture.java
updated new files from paige's line endings in newest graphics test branch
Merge branch 'master' into graphicsTestingContinued - fixing line endings