WIP
updated graphing
Merge branch 'master' of https://github.com/micahlisonbee/symptomz into new_pod

Conflicts:
	ios/Podfile
	ios/Podfile.lock
	ios/Pods/Manifest.lock
	ios/Pods/Pods-FXKeychain-Private.xcconfig
	ios/Pods/Pods-MagicalRecord-Private.xcconfig
	ios/Pods/Pods-ReactiveCocoa-Private.xcconfig
	ios/Pods/Pods.xcconfig
	ios/Pods/Pods.xcodeproj/project.pbxproj
	ios/symptomz/Base.lproj/Main.storyboard
	ios/symptomz/DataViewController.m
added graphing updated