ERRORS
fuk
jFSFGIOJelk/
Merge branch 'master' of https://github.com/satolyte/veritours

Conflicts:
	.DS_Store
	Veritours4/Main_iPhone.storyboard