user page styles
Merge branch 'master' of github.com:mondora/mnd-website

Conflicts:
	app/pages/user/user.html
	app/pages/user/user.scss