consolodate content
Merge branch 'master' of github.com:AstroHackWeek/day1
consolodate content