I filled the screenshots and saves folder, just so that they don't disappear. Also, made minor adjustments elsewhere.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mEngine/core/GameController.java
I filled the screenshots and saves folder, just so that they don't disappear. Also, made minor adjustments elsewhere.