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