Updated stuff. not sure what...
Merge branch 'master' of git://github.com/trozamon/hackathon

Conflicts:
	jetzt-site/app/views/welcome/index.html.erb
	jetzt-site/app/views/welcome/style.css
Don't fuck this up :)
Cleaned up some code a little bit.
Merge branch 'master' of git://github.com/vianuevm/hackathon