require and jquery, fetching github commits
Merge branch 'master' of github.com:joshcough/joshcough.github.com

Conflicts:
	index.html
moved file