remove and rename files
Merge branch 'master' of https://github.com/waali/bhis

Conflicts:
	controller/about.php
	controller/home.php