nermina edit vehicle
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/Sign_In.php
	application/views/edit_vehicles.php
	application/views/employee.php