First commit
Resolved conflicts
Merge pull request #2 from gutbombstinky/master

Update README