Semantics
Merge branch 'master' of github.com:RenatoGeh/hammertime

Conflicts:
	game/hammertime.h
	game/list.h