Set .gitignore
Merge branch 'master' of https://github.com/schwartzman/cht-dev

Conflicts:
	.gitignore