css
Conflicts:
empty
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop
Hash
Merge branch 'develop' of https://github.com/bakasajoshua/PhilosophicalAnthropology into develop

Conflicts:
	application/modules/home/models/registration.php