fixed tags
Merge branch 'master' of https://github.com/nikshi/TeamPhuket