final commit for hackmit
Merge pull request #26 from yoonsw15/upcomingBranch

final commit for hackmit