made changes
Merge branch 'master' of https://github.com/DChien/First-Hackathon