merge
revert me
Revert "revert me"

This reverts commit 439ecf20423363a8cdb5d0d7ac8fb496d6c254db.
db
Merge branch 'master' of https://github.com/devDesign/KarmaCloud
database seed and test db
Merge branch 'layout_branch'
Seed data working and uplaoded
"update"
Merge branch 'master' of https://github.com/devDesign/KarmaCloud
Merge branch 'maps-api'
Merge branch 'master' of https://github.com/devDesign/KarmaCloud into layout_branch