test
Merge branch 'master' of github.com:winnab/celebrity

Conflicts:
	scripts/main.js