commit
Merge branch 'master' of https://github.com/artiespeedy/Animation-Academy

Conflicts:
	scripts/script.js