errored files
Merge branch 'master' of https://github.com/a-angeles/Restaurants

Conflicts:
	tiapp.xml