views
 Please enter the commit message for your changes. Lines starting
resolved conflicts:erge branch 'master' of github.com:sachinvelaga/Ecomm

Conflicts:
	application/config/database.php
	application/controllers/home.php
	application/views/home.php
Worked on