Final updates
fixing README merge conflict
Merge pull request #5 from andrewheartsxd/newbranch

Newbranch