see last commit
Merge branch 'master' of github.com:danheidel/alongtheway
merged with Jeongs stuff & removed old comments