Ricky: inital input
Merge branch 'master' of https://github.com/astrofoley/astr596
Ricky's initial input