*cough*
Merge branch 'master' of github.com:toniokroeger/c24

Conflicts:
	17th_Hour/Makefile