Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop
Buenos Noches my niggas
Homepage 80%
Badilisheni Picha,just replace the respective portraits in the img folders with your likelinesses

Signed-off-by: karsanrichard <karsanrichard@gmail.com>
Signed-off-by: karsanrichard <karsanrichard@gmail.com>
Merge branch 'develop' of https://github.com/johnotaalo/PhilosophicalAnthropology into develop
content
post asset copying
Signed-off-by: karsanrichard <karsanrichard@gmail.com>
freedom/sexuality
Signed-off-by: karsanrichard <karsanrichard@gmail.com>
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
admin
Merging with chris
Signed-off-by: karsanrichard <karsanrichard@gmail.com>
conflict
Conflicts
seth
dbv
Changes to admin page