YOLO
Merge branch 'master' into styling

Conflicts:
	app/assets/stylesheets/application.css.scss
Merge pull request #82 from dhouk24/styling

YOLO