Updates
merge conflicts fixed
gitignore
more gitignore
Merge pull request #22 from garethleonard/master

Minor fixes