Kind of made the layout.
Okay, actually put my files on the repo.
Merge branch 'master' of git://github.com/messes/hackathon

Conflicts:
	jetzt-site/app/views/welcome/index.html.erb
	jetzt.html