Added comment line to ending
Fixed Conflict
Merge pull request #1 from rlusk/master

Please Review