Merge pull request #1 from JackDougherty/gh-pages

sync to master
star icon
Merge pull request #2 from JackDougherty/master

sync to gh