Merge branch 'master' of https://github.com/fabiojmendes/ccn.git

Conflicts:
	README.md
Readme
Merge branch 'master' of https://github.com/fabiojmendes/ccn.git