schema
Merge branch 'master' of github.com:bluehandtalking/live-here
clearing changes so merge can happen
merge issues