manifest
Merge remote-tracking branch 'upstream/master'
updated manifest
Merge remote-tracking branch 'upstream/master'

Conflicts:
	manifest.webapp
modified
Merge pull request #6 from luckylavish/master

Final Repo for version 1