instructor amend
Brushed
gitignore
admin
some changes on the 404 page
Merge branch 'develop' of https://github.com/bakasajoshua/PhilosophicalAnthropology into develop
Merge branch 'master' of https://github.com/karsanrichard/PhilosophicalAnthropology into develop

Conflicts:
	application/modules/admin/controllers/admin.php
	application/modules/admin/views/admin_home.php
	application/modules/home/controllers/home.php
	application/modules/home/models/registration.php
changes to master
Major shift
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop

Conflicts:
	application/modules/admin/models/admin_model.php
	application/modules/admin/views/admin_home.php
	application/modules/content/views/freedom_view.php
	application/modules/home/models/registration.php
	application/modules/home/views/homepage.php
	application/modules/home/views/member_registration.php
	assets/css/home-custom.css
	assets/js/bootstrap.js
	assets/js/bootstrap.min.js
	assets/js/home_custom.js
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology

Conflicts:
	application/modules/home/controllers/home.php
	application/modules/home/models/registration.php
Content and home styled.
Login working but username and info not displayed after login
Logout also works fine for admin

Signed-off-by: karsanrichard <karsanrichard@gmail.com>