allochtoon image
basic menu
Merge branch 'master' of https://github.com/PhillSlevin/hackatown_cobra

Conflicts:
	axelgame/css/main.css