Waypoint Commit 1

Added first try at waypoints
modified waypoint reading code to handle > 9 waypoints
Merge branch 'Waypoint-Expansion-Module'