sprint 2
Merge branch 'master' of https://github.com/stianwe/USNeuroNav
Fixed most of Nancy's comments