100 or 1000?
Merge branch 'master' of https://github.com/van-Kalsing/ANPA

Conflicts:
	navigation.py
resolved