Merge branch 'master' of https://github.com/d2theb/assemble

Conflicts:
	app/assets/javascripts/projects.js
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/bootstrap_and_overrides.css.scss
	app/views/projects/index.html.erb
Merge branch 'master' of https://github.com/d2theb/assemble

Conflicts:
	app/views/projects/index.html.erb
update
big update
Merge branch 'master' of https://github.com/d2theb/assemble
white wrapper