Fixed some issues
Merge branch 'master' of github.com:Wyattjoh/TaggingApp