Merge pull request #1 from TheBrockEllis/master

Merge master with Github pages
Update README.md
Update README.md