Revert "opps??"

This reverts commit 5c48929a46415cb8cba25bb48e95c6d548f7418e.

Conflicts:
	bower_components/isotope/.bower.json
	bower_components/isotope/README.mdown
	bower_components/isotope/bower.json
	bower_components/isotope/dist/isotope.pkgd.js
	bower_components/isotope/dist/isotope.pkgd.min.js
	bower_components/isotope/js/isotope.js
	bower_components/isotope/js/item.js
	scss/_mixins.scss
	scss/style.scss
	style.css