gitignore, flask tutorial
Merge branch 'master' of https://github.com/tonyin/cambitas

Conflicts:
	.gitignore