Update dependencies
Merge branch 'master' of github.com:twistedgood/shioris

Conflicts:
	README.md