Stephanie Anderl a418777f02 Merge master into feature/GraphingCalculator branch (#585) ... * Merge master into feature/GraphingCalculator branch		2019-07-15 11:17:21 -07:00
..
AspectRatioTrigger.cpp	Merge master into feature/GraphingCalculator branch (#585)	2019-07-15 11:17:21 -07:00
AspectRatioTrigger.h	Merge master into feature/GraphingCalculator branch (#585)	2019-07-15 11:17:21 -07:00