bug fixes (still horrible)
Merge branch 'master' of https://github.com/cupofjoakim/Molgan

Conflicts:
	app/styles/css/main.css
	app/styles/scss/main.scss
	app/views/main.html