Merge pull request #25 from silshack/gh-pages

Updating my fork
Starpusher post
Merge pull request #26 from silshack/gh-pages

updating my fork
Merge pull request #516 from DanielleWingler/gh-pages

Starpusher post