blah blah
Merge branch 'master' of https://github.com/bergero8/291-mobileapp

Conflicts:
	app/lib/data/app.json
	app/views/home.xml
	app/views/text.xml
zzz
ds