Merge pull request #27 from ryanshawty/master

Updated README.md on master
Merge pull request #28 from ryanshawty/dev

Merge pull request #27 from ryanshawty/master