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
Merge remote-tracking branch 'chris/develop'

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

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