Merge branch 'master' into topic/trait_validation
commitbcde727b44219a93147dc1857200bb32542c85e2
authornickmorales <nmorales3142@gmail.com>
Fri, 14 Apr 2017 19:17:27 +0000 (14 15:17 -0400)
committernickmorales <nmorales3142@gmail.com>
Fri, 14 Apr 2017 19:17:27 +0000 (14 15:17 -0400)
treee1068b91b912fec88fd7cafca85a537f8b33b4c2
parent198d70ba3d290d60c3c650bc911819e606969e82
parent2309659d1c3d70102895d4d5307718920182ca86
Merge branch 'master' into topic/trait_validation