adding changes to four files model/user, controller/users, views/user_profile, css/taxi-masr.css
Merge branch 'master' of https://github.com/ITI-PHP-CI-2013/taximasr
Merge branch 'master' of https://github.com/ITI-PHP-CI-2013/taximasr
Merge branch 'master' of https://github.com/ITI-PHP-CI-2013/taximasr