change
accounts/index.html.erb: Email and password will show up on the account
page.
Merge branch 'master' of git://github.com/messes/hackathon
Merge branch 'master' of git://github.com/trozamon/hackathon
Added session support. Working on top bar.
Merge branch 'master' of git://github.com/messes/hackathon
Merge branch 'master' of git://github.com/trozamon/hackathon
Top bar is now working.
So much stuff has happened. I really need to commit more often and unit
test. But that's for people that know what they're doing.
Merge branch 'master' of git://github.com/messes/hackathon
Merge branch 'master' of git://github.com/vianuevm/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
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