test
Merge branch 'master' of https://github.com/Mattze96/pocketsphinx-python

Conflicts:
	main.py