Committing my .gitignore because it has conflicting changes and I want to do a pull.
Merge branch 'master' of https://github.com/paperbakwriter09/RideMix

Conflicts:
	.gitignore
Native iOS app. I've added a video to our Google Drive folder showing it running. Fetches places from RideMix server but friends directly from facebook.
Merge branch 'master' of https://github.com/paperbakwriter09/RideMix