wip
wip
Merge branch 'master' into what

Conflicts:
	index.js
use csswhat
fix text
add package