gitignore
Merge branch 'master' of https://github.com/Diolex/The-Hoppening

Conflicts:
	The_Hoppening-android/bin/jarlist.cache
	The_Hoppening/bin/.gitignore