commented, cleaned up
Merge branch 'master' of https://github.com/Delors/Vespucci2.git