minor things
Merge branch 'master' of github.com:gitfelix/battlehack

Conflicts:
	app/views/layouts/_header.html.erb
Merge branch 'master' of github.com:gitfelix/battlehack

Conflicts:
	app/views/things/show.html.erb