Merge pull request #21 from jmullercuber/master

Error redirecting - 3
Redirect, actually tested :P
Merge pull request #22 from jmullercuber/gh-pages

Redirect, working