Got everything ready to add Adam's commit
Forgot to upload some files
Fixed what I messed up
Merge branch 'master' of github.com:Taormina/OnlineTrail

Conflicts:
	popup.js