content edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/home/index.blade.php
CLEANING UP