changes to videos
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop

Conflicts:
	assets/css/main.css
freedom
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop
Added Flat UI, Semantic and the error 404 page
Merge branch 'develop' of https://github.com/bakasajoshua/PhilosophicalAnthropology into develop
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop
human sexuality
upgraded videos page
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop
Merge branch 'develop' of https://github.com/bakasajoshua/PhilosophicalAnthropology into develop
added doctrine and also worked on registering the questions
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop
content
freedom/sexuality
questions and admin dashboard
ADMIN
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology
Merge branch 'develop' of https://github.com/bakasajoshua/PhilosophicalAnthropology

Conflicts:
	application/config/autoload.php
project