New Hello World
Merge branch 'master' of https://github.com/xiangruiprince/TeamYOLO

Conflicts:
	.cordova/config.json