near finished
Merge branch 'master' of https://github.com/Scott123180/hackathon