Doing what I want
Merge pull request #1 from adamrankin/master

Testing pull request feature