I swear I know how to program

Really, I do
Merge pull request #6 from skwerlman/dev

I swear I know how to program