fixed absolute paths in .classpath (i think)
deleted gitignored bin/
rm --cached everything and then git add

for some reason these changes were added;
none of them should be conseqential.
Merge branch 'hotfix_jarsplusgitignore' into bugfixe

Conflicts:
	angelgame-desktop/bin/Sprites/PauseText.png
	angelgame-desktop/src/com/cal/angelgame/Main.java
	angelgame/.classpath

This merge is a fucking mess because hotfix branch deleted a shitton of
files and changed the way we handle eclipse generated project settings
etc. I'm going to commit and then do a damage assessment after ._.
deleted temp files created by merge
cleaned Main.java after merge