big update
big commit master
merged
before cf
functionality done
Merge branch 'master' of https://github.com/DrewWeth/HackMidwest