Merge branch 'master' of https://github.com/FrancisVega/Pynav

Conflicts:
	pynav.py
updated from win
updated