git conflict stuffz on gh-pages xD

[connorbode]

Hey, just thought I'd let you know that you have some conflict remnants showing up on your gh-pages site:

[engelfrost]

Thanks!