what did I change?
Merge branch 'master' of github.com:fijiaaron/oneshore

Conflicts:
	site/rails/Gemfile
	site/rails/app/assets/css/site.css.css
	site/rails/app/assets/stylesheets/site.css.scss