Initial commit
Merge branch 'master' into github/learnr/master

Conflicts:
	README.md
Merge branch 'draft' into github/learnr/master
Merge branch 'master' into master-1