app works with tags
fixing merge
merging
Merge branch 'master' of https://github.com/gruhls508/FreshSpheroApp into meredith

ok
commiting so glen can ready for the demo