Cleared
Graphs Commit
Merge branch 'Graphs-Bianca' into Working-Copy

Conflicts:
	AppDelegate.h
	AppDelegate.m
	BScatterPlot.h
	BScatterPlot.m
	Images.xcassets/AppIcon.appiconset/Contents.json
	Images.xcassets/Image.imageset/Contents.json
	Images.xcassets/Image.imageset/icon.png
	Images.xcassets/LaunchImage.launchimage/Contents.json
	MainViewController.h
	MainViewController.m
	MainViewController.xib
	RecordViewController.h
	RecordViewController.m
	Sliders.xib
	SlidersAndGraph-Info.plist
	SlidersAndGraph-Prefix.pch
	SlidersAndGraph/Images.xcassets/AppIcon.appiconset/Contents.json
	SlidersAndGraph/Images.xcassets/Image.imageset/Contents.json
	SlidersAndGraph/Images.xcassets/LaunchImage.launchimage/Contents.json
	SlidersAndGraph/SlidersAndGraph-Info.plist
	SlidersAndGraph/SlidersAndGraph-Prefix.pch
	SlidersAndGraph/en.lproj/InfoPlist.strings
	SlidersAndGraph/main.m
	UIColor+CustomColors.h
	UIColor+CustomColors.m
	en.lproj/InfoPlist.strings
	icon.png
	main.m
	myMindTrack/Images.xcassets/AppIcon.appiconset/Contents.json
	myMindTrack/Images.xcassets/LSPiOSTemp.imageset/Contents.json
	myMindTrack/Images.xcassets/LaunchImage.launchimage/Contents.json
	myMindTrack/en.lproj/InfoPlist.strings
	myMindTrack/main.m
	myMindTrack/myMindTrack-Info.plist
	myMindTrack/myMindTrack-Prefix.pch