The iOS App

/Users/tylerhardy/Desktop/CS8803/Table_view_test
Merge branch 'master' of https://github.com/i3l/CDC-Project

Conflicts:
	.DS_Store