Resolved conflict in Tag model
Merge branch 'master' of github.com:SandyLudosky/SafeHaven