Worked the initial loading order slightly for reliability
Merge branch 'master' of github.com:acheson/cs171pj2

Conflicts:
	site/js/main.js