initial commit
added htaccess
nick is a phaggot
nick is a phaggot
Merge branch 'master' into HEAD

Conflicts:
	application/config/application.php
	application/routes.php
	application/views/home/index.blade.php