Add CSS styles
Merge branch 'styling-continued'
Merge conflict resolution

Conflicts:
	app/assets/stylesheets/users.css.scss