From: jordan lavatai <jordanlavatai@gmail.com>
Date: Wed, 12 Jul 2017 19:13:29 +0000 (-0700)
Subject: Merge branch 'master' of github.com:Jlavatai/strapp
X-Git-Url: https://git.kengrimes.com/?p=henge%2Fkiak.git;a=commitdiff_plain;h=a8bdc6c150c4f3417b2f18a480552a4015c248b1;hp=a8bdc6c150c4f3417b2f18a480552a4015c248b1

Merge branch 'master' of github.com:Jlavatai/strapp
---