Added license
Merge remote-tracking branch 'origin/master' into cake3

Conflicts:
	README.md