py
Merge remote-tracking branch 'origin/@work'

Conflicts:
	Pythomaton/automaton/PrefixAutomaton.py
	Pythomaton/main.py