added tags
Merge branch 'master' of github.com:stecd/vivahunt