new
Merge branch 'master' of https://github.com/jacobraven/phonegap-workshop-master

Conflicts:
	js/main.js