Delete pycharm.png
Merge branch 'testing'
Merge branch 'testing'
Refactor.
Merge branch 'master' into testing

Conflicts:
	parser/parsers.py