Update for Joe
Merge branch 'master' of https://github.com/RosyTucker/RosyTucker.github.io

Conflicts:
	js/content.js