modified:   .gitignore
Merge branch 'master' of github.com:sennychu/tvctop.info

Conflicts:
	.gitignore

	modified:   .exports
	modified:   .gitignore