8
9
"Merge branch 'dev'

Conflicts:
	LICENSE
LIC and a.sh
merge master