Merge pull request #2 from pa5tabear/master

asdf
pull learning
Merge pull request #1 from dreid1991/master

A very important change for a very important Matt