Merge branch 'master' of github.com:ahtik/dotdotbox

Conflicts:
	README.md