Me view saves/loads data to/from parse
Saving everything before merge
After adding new things to me view
Merge branch 'master' into merge3

Conflicts:
	Flatiron-App.xcodeproj/project.pbxproj
	Flatiron-App/Base.lproj/Main.storyboard
Add tab bar icons