Add alerts to application
Merge branch 'master' of https://github.com/tmcmullin/PhoneGapExample

Conflicts:
	index.html
	js/main.js