From: jordan <jordanlavatai@gmail.com>
Date: Wed, 2 Aug 2017 20:24:50 +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=a7e6c36b91dd1a36021f7459200436b3cb31d756

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

a7e6c36b91dd1a36021f7459200436b3cb31d756