Christiano, Kevin b592ff5047 Merge branch 'develop' into feature/kevin ... # Conflicts: # MVMCoreUI.xcodeproj/project.pbxproj		2019-03-21 15:47:49 -04:00
..
Buttons	Merge branch 'develop' into feature/kevin	2019-03-21 15:47:49 -04:00
TextFields	remove accidental line; for testing.	2019-03-19 16:16:01 -04:00
Views	Merge branch 'develop' into feature/kevin	2019-03-21 15:47:49 -04:00