Merge pull request #3 from kguischard13/master

Test 3
Chris Wuz Here
Merge pull request #1 from Caf131/master

chris wuz here