change version
Merge branch 'master' of github.com:Coding-House/crunchbase2

Conflicts:
	package.json
merge finish
Merge branch 'master' of github.com:Coding-House/crunchbase2