General Portfolio updates
Merge branch 'master' of https://github.com/spense/portfolio-site

Conflicts:
	assets/functions.js