miked getting red to merge versions
Merge branch 'master' of github.com:bakalarmh/cell-scope-loa

Conflicts:
	.DS_Store
	CellScopeLoa.xcodeproj/project.pbxproj
	CellScopeLoa/MotionAnalysis.mm
	CellScopeLoa/en.lproj/MainStoryboard_iPhone.storyboard
Merge branch 'master' of github.com:bakalarmh/cell-scope-loa