ref: 902ec1a8c46d93883dce62915142e6e990d1f8ea
parent: 8ea6beedb619eda993c77d7cb5d5c3bd53b4db50
parent: eed80d7ae6c768be4420b4f5976708c4d35fad41
author: levesqu8 <levesqu8@msu.edu>
date: Thu Jan 25 11:07:56 EST 2018
Merge branch 'newResolutions'