Merge pull request #1 from Caf131/master

chris wuz here
Change made
Merge pull request #4 from kguischard13/master

Change
Merge pull request #2 from Caf131/master

Change Made