INTRO MADNESS
Merge branch 'master' of https://github.com/RenatoGeh/hammertime

Conflicts:
	game/intro.c