Creating template
Merge branch 'master' of ssh://cb-mcjffld.rhcloud.com/~/git/cb

# By Template builder
# Via Template builder
* 'master' of ssh://cb-mcjffld.rhcloud.com/~/git/cb:
  Creating template

Conflicts:
	README.md
	package.json