Update the main.js to use require.js
Merge branch 'master' of github.com:jeffshaver/jeffshaver.github.io

Conflicts:
	javascripts/main.js