db changes
conflict resolved
Merge branch 'live' of https://github.com/abaecor/littleflorist into live