Merge branch 'master' into topic/trait_validation
commit198d70ba3d290d60c3c650bc911819e606969e82
authornickmorales <nmorales3142@gmail.com>
Thu, 13 Apr 2017 20:30:26 +0000 (13 16:30 -0400)
committernickmorales <nmorales3142@gmail.com>
Thu, 13 Apr 2017 20:30:26 +0000 (13 16:30 -0400)
tree681d47a9baf597eccd69e511d37986eb06d7c8c3
parentde6cf06450257348900ff03d7ddc3e98a34523f6
parent981fd4212f9d1cb905470eaabd53a80f27337199
Merge branch 'master' into topic/trait_validation