edited manitest
Merge branch 'master' of https://github.com/jonwrona/hackrpi.tripadvisor

Conflicts:
	manifest.json