merge
Merge branch 'master' of https://github.com/arap/Chip-Totality

Conflicts:
	ChipTotality/src/com/res/Loader.java
	ChipTotality/src/com/screen/GameScreenRenderer.java