Edit Video
Merge branch 'master' of https://github.com/tsaqova/WeCare

Conflicts:
	application/config/database.php
	application/views/layout/default_layout.php
	assets/css/style.css