added
Merge branch 'master' of github.com:maniax88/andrewturgeon

Conflicts:
	application/controllers/pages.php
	application/views/pages/about.php
	application/views/pages/home.php
	application/views/templates/footer.php
	application/views/templates/header.php
fixes so that it works right
removed htaccess