best in place working
adding assets
best in place working

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	app/assets/stylesheets/projects.css.scss
	app/views/projects/_project.html.erb
adding assets
adding assets
Merge branch 'master' into new-master