Working on style
Merging
Merge branch 'master' into Jen

Conflicts:
	app/assets/stylesheets/global.css