style update
Merge branch 'master' of https://github.com/mvandeloo/360life

Conflicts:
	app/assets/stylesheets/style.css
devise styling and q layout
Merge branch 'master' of https://github.com/mvandeloo/360life
updated main stylesheet
Merge branch 'master' of https://github.com/mvandeloo/360life