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

* 'master' of github.com:sennychu/tvctop.info:
  Initial commit