edit profile view and function in controller name go_edit and function edit_profile  and model user contain function update info
Merge branch 'master' of https://github.com/ITI-PHP-CI-2013/taximasr

Conflicts:
	.htaccess
	application/controllers/users.php
	application/models/user.php
Merge branch 'master' of https://github.com/ITI-PHP-CI-2013/taximasr

Conflicts:
	.htaccess
Merge branch 'master' of https://github.com/ITI-PHP-CI-2013/taximasr
Merge branch 'master' of https://github.com/ITI-PHP-CI-2013/taximasr