coooooool

alot of stuufs
Merge remote-tracking branch 'origin/master'

Conflicts:
	header-loggedout.html
	index.html
	js/app.js