Merge branch 'master' of git://github.com/trozamon/hackathon
Merge branch 'master' of git://github.com/trozamon/hackathon
barf
Fixed some stuff. Need to commit to merge.
Merge branch 'master' of git://github.com/vianuevm/hackathon

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