Fix the octocat!
Merge branch 'master' of github.com:fapprik/js-tricks.com

Conflicts:
	templates/footer.php