Merge pull request #5 from joshball/master

Fixing merge conflicts, and updating readme and gitignore