hotfix
Merge branch 'hotfix'
Merge branch 'master' of https://github.com/16twenty/joelverreault

Conflicts:
	application/views/partials/header.php