Edited this file because titus told me to
Merge pull request #1 from madkaplan/master

here is my stuff
Merge pull request #1 from ctb/master

My stuff is awesome