moving towards masteries
Merge branch 'master' of github.com:rkgibson2/hackfest-project

Conflicts:
	main.js
working on masteries
Merge branch 'master' of github.com:rkgibson2/hackfest-project