someinth
Merge remote-tracking branch 'origin/master'
added photos to the app
Merge remote-tracking branch 'origin/master'
try to fix things
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/Philanthropy/DataFile.plist.new
	Project/Philanthropy/NewDataFile.plist
	Project/Philanthropy/en.lproj/new.plist
Merge remote-tracking branch 'origin/master'
still trying
Merge remote-tracking branch 'origin/master'
trying to get this working
Merge remote-tracking branch 'origin/master'
new storyboards
Ok where to start...
Converted the skeleton of the app over to using a Navigation Controller,
Made new UIViews for each view we had before (formatting issues, needed a xib file for the nag controller)
Modified the App.delegate to contain the values for the nav controller (home screen, map, directory, near me, and donate)
Setup the NearMe TableViewController inside the navbar
Setup the DetailedView to work with the NearMe TableView
Redesigned the DetailedView
Setup the Directory TableView inside the navbar
Setup the DetailedView to work with the Directory TableView as well
Made custom UITableCells with a bit of formatting
Updated the Directory and NearMe TableViews to use the new cells,
Styled the custom cells with a background, thumbnail, frame for the thumbnail,
Styled the Navbar, Navigationbar, SearchBox, and BackButton with leather,
Added the distance to the custom cells inside the view
guess i missed 2 buildings
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/Philanthropy/DetailViewController.m