changed some names
Merge branch 'master' of https://github.com/astrofoley/astr596
I have no idea whats happening anymore