Touching up the input/main
Merge remote-tracking branch 'origin/master'

Conflicts:
	Shock Engine v1.0/src/main/ImageLoader.java