Fixing merge conflict
Merge branch 'master' of https://github.com/steve-kim/PersonalProjects.git