Latest commit 88e95b3 Aug 19, 2016 @fauge7 committed on GitHub Merge pull request #3 from GreenBlitz4590Programmers/patch-1
Fixed merge conflicts left overs