Merge pull request #2 from jmwhicke/master

Update files... hopefully.
Merge pull request #3 from jmwhicke/jmwhicke

Merge pull request #2 from jmwhicke/master