taging system, there is a waird error
Merge branch 'master' of https://github.com/sootn/Meta-TV
smething whent wrong while comit --amend
Conflicts:
	Meta-TV/client/index.html