Merge branch 'master' of github.com:Jlavatai/strapp
authorjordan <jordanlavatai@gmail.com>
Wed, 2 Aug 2017 20:24:50 +0000 (13:24 -0700)
committerjordan <jordanlavatai@gmail.com>
Wed, 2 Aug 2017 20:24:50 +0000 (13:24 -0700)

Trivial merge