git merge
Merge branch 'master' of https://github.com/naveedaziz/Bda

Conflicts:
	application/controllers/frontend/home.php