Merge branch 'master' of https://github.com/aromanovich/python-magic into aromanovich-master

Conflicts:
	test.py