Fixing git merge markup
Merge pull request #15 from Caboose885/master

Updates!
Merge pull request #16 from covertcodeop/master

Fixing git merge markup