dict expansion
Merge branch 'master' of https://github.com/nazarjoh/sha-bang

Conflicts:
	dict