Merge pull request #5 from ConnerHAnderson/conner

Conner
No crap