Toggle & colors - working
Merge branch 'master' of https://github.com/jooskim/TimeAndMotionStudy

Conflicts:
	test7/en.lproj/MainStoryboard.storyboard