combining files
Merge branch 'master' of git://github.com/astrofoley/astr596
moving files