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

Conflicts:
	Pythomaton/automaton/__init__.pyc
	Pythomaton/automaton/automaton.pyc
	Pythomaton/main.py
	Pythomaton/suffixtrie/__init__.pyc
	Pythomaton/suffixtrie/suffixtrie.py
	Pythomaton/suffixtrie/suffixtrie.pyc