Fix Problem
Merge commit '0a6acc36c234be8adffd716da47d3599afe32504' into HEAD

Conflicts:
	application/views/pages/home.php
	application/views/templates/header.php
	home.css
Fix Problem
Merge pull request #1 from kampoengboy/HEAD

Head