pid working
Merge branch 'master' of github.com:pd0wm/EPO4

Conflicts:
	navigator.py