add gitignore
git init
Merge branch 'master' of github.com:boyone/tmn-web-demo

Conflicts:
	.gitignore