more stuff.
Merge branch 'master' of github.com:JasonStoltz/hackquest

Conflicts:
	content.js