Changed gitignore

Needs recommit
Merge branch 'new_engine' of https://github.com/davidgiga1993/SOLAR into new_engine

Conflicts:
	Project/Solar-desktop/src/com/me/solar/Main.java
	Project/Solar/bin/.gitignore