license update
Merge remote-tracking branch 'origin/master'

Conflicts:
	LICENSE
	README.md
license update