Ok Done
Merge remote-tracking branch 'origin/master'
Co
Commit done
Commit Done
Done
Commit
Commit
Merge branch 'github'
Merge remote-tracking branch 'origin/master'

Conflicts:
	sortedfoodies.xcodeproj/project.pbxproj
megre source
Merge remote-tracking branch 'origin/master'

Conflicts:
	sortedfoodies.xcodeproj/project.pbxproj
Done
Done
Done
Merge remote-tracking branch 'origin/master'
Done
change to intro view
Merge remote-tracking branch 'origin/master'
intro view