init commit

init commit
Merge branch 'master' of https://github.com/gthoma17/Class-A-app

Conflicts:
	manifest.json