README update
Merge branch 'master' of https://github.com/matteomenapace/codeclub

* 'master' of https://github.com/matteomenapace/codeclub:

Conflicts:
	README.md