First check in
Merge branch 'master' of https://github.com/Ywoo/promise_cs

Conflicts:
	.gitignore