Attempt to fix js
Merge branch 'master' of github.com:Jaswetz/Personal-Website

Conflicts:
	middleman-portfolio/source/js/main.js
Optimize build