u
Merge branch 'master' of https://github.com/acroidea/action.js

Conflicts:
	README.md