Commit ku
Merge branch 'master' of https://github.com/GiovSolution/babybright

Conflicts:
	system/application/views/main/v_about.php