Merge branch 'Bianca'
Added Profile and EditProfile view - ongoing

Just added. Will make changes later on
More UI changes
ignore
Added EditProfViewController - pass data to Profile, no save data
Andrew commit
Merge branch 'master' of https://github.com/bianxie/MAJ_2013

Conflicts:
	MAJApp/MAJApp.xcodeproj/project.pbxproj
	MAJApp/MAJApp/MainMenuViewController.m
	MAJApp/MAJApp/MainMenuViewController.xib
Latest
Revert "Latest"

This reverts commit 453087a3b7e27906ea3558475ebc3f48f9b42d70.
Revert "Merge branch 'master' of https://github.com/bianxie/MAJ_2013"

This reverts commit f59590b51f74fae0510a02a7d9cf8bce5179a19b, reversing
changes made to 0ac9c2ac9def018ee31bd5abe98beb21e660d8dc.
Revert "Andrew commit"

This reverts commit 0ac9c2ac9def018ee31bd5abe98beb21e660d8dc.
Commiting Andrew's Diary and Save stuff
ignore
ignore
Diary, Profile, EditProfile, EditMedications (just view)
Sync
Sync
sync
Merge branch 'master' into Bianca

Conflicts:
	.gitignore
	MAJApp/MAJApp/MAJApp.xcodeproj/project.pbxproj

MAJApp/MAJApp/MAJApp.xcodeproj/project.xcworkspace/contents.xcworkspaced
ata

MAJApp/MAJApp/MAJApp.xcodeproj/xcuserdata/Work.xcuserdatad/xcschemes/MAJ
App.xcscheme

MAJApp/MAJApp/MAJApp.xcodeproj/xcuserdata/Work.xcuserdatad/xcschemes/xcs
chememanagement.plist

MAJApp/MAJApp/MAJApp.xcodeproj/xcuserdata/andrewpicard.xcuserdatad/xcsch
emes/MAJApp.xcscheme

MAJApp/MAJApp/MAJApp.xcodeproj/xcuserdata/andrewpicard.xcuserdatad/xcsch
emes/xcschememanagement.plist
	MAJApp/MAJApp/MAJApp/AppDelegate.h
	MAJApp/MAJApp/MAJApp/AppDelegate.m
	MAJApp/MAJApp/MAJApp/DoctorInfoViewController.h
	MAJApp/MAJApp/MAJApp/DoctorInfoViewController.m
	MAJApp/MAJApp/MAJApp/Images.xcassets/AppIcon.appiconset/Contents.json
	MAJApp/MAJApp/MAJApp/Images.xcassets/FinniOSTemp.imageset/Contents.json

MAJApp/MAJApp/MAJApp/Images.xcassets/FinniOSTemp.imageset/FinniOSTemp.pn
g

MAJApp/MAJApp/MAJApp/Images.xcassets/FlamePrincessiOSTemp.imageset/Conte
nts.json

MAJApp/MAJApp/MAJApp/Images.xcassets/FlamePrincessiOSTemp.imageset/Flame
PrincessiOSTemp.png

MAJApp/MAJApp/MAJApp/Images.xcassets/GunteriOSTemp.imageset/Contents.jso
n

MAJApp/MAJApp/MAJApp/Images.xcassets/GunteriOSTemp.imageset/GunteriOSTem
p.png
	MAJApp/MAJApp/MAJApp/Images.xcassets/JakeiOSTemp.imageset/Contents.json

MAJApp/MAJApp/MAJApp/Images.xcassets/JakeiOSTemp.imageset/JakeiOSTemp.pn
g
	MAJApp/MAJApp/MAJApp/Images.xcassets/LSPiOSTemp.imageset/Contents.json
	MAJApp/MAJApp/MAJApp/Images.xcassets/LSPiOSTemp.imageset/LSPiOSTemp.png

MAJApp/MAJApp/MAJApp/Images.xcassets/LadyRainicorniOSTemp.imageset/Conte
nts.json

MAJApp/MAJApp/MAJApp/Images.xcassets/LadyRainicorniOSTemp.imageset/LadyR
ainicorniOSTemp.png

MAJApp/MAJApp/MAJApp/Images.xcassets/LaunchImage.launchimage/Contents.js
on

MAJApp/MAJApp/MAJApp/Images.xcassets/PrincessBubblegumiOSTemp.imageset/C
ontents.json

MAJApp/MAJApp/MAJApp/Images.xcassets/PrincessBubblegumiOSTemp.imageset/P
rincessBubblegumiOSTemp.png
	MAJApp/MAJApp/MAJApp/MAJApp-Info.plist
	MAJApp/MAJApp/MAJApp/MAJApp-Prefix.pch
	MAJApp/MAJApp/MAJApp/MainMenuViewController.h
	MAJApp/MAJApp/MAJApp/MainMenuViewController.xib
	MAJApp/MAJApp/MAJApp/ResultsViewController.h
	MAJApp/MAJApp/MAJApp/ResultsViewController.m
	MAJApp/MAJApp/MAJApp/en.lproj/InfoPlist.strings
	MAJApp/MAJApp/MAJApp/main.m