messed up
change order in controller
Merge branch 'working'

Conflicts:
	app/assets/javascripts/portfolio.js
	app/assets/stylesheets/portfolio-responsive.css.less
	app/assets/stylesheets/portfolio.css.less