Starting fresh - we're not frustrated!
Merge branch 'master' of https://github.com/bergero8/291-mobileapp

Conflicts:
	.gitignore
	app/controllers/home.js
	app/controllers/index.js
	tiapp.xml