Christiano, Kevin 8ebcef3a60 Merge branch 'develop' into feature/kevin ... # Conflicts: # MVMCoreUI/Atoms/Views/Label.swift		2019-06-04 16:23:06 -04:00
..
Buttons	reset function.	2019-06-04 12:42:52 -04:00
TextFields	Merge branch 'develop' into feature/cleaner_molecule_working	2019-06-04 12:43:37 -04:00
Views	Merge branch 'develop' into feature/kevin	2019-06-04 16:23:06 -04:00