edit dikit
Merge branch 'master' of github.com:igrir/Myschedule
Merge branch 'master' of github.com:igrir/Myschedule
Merge branch 'master' of github.com:igrir/Myschedule

Conflicts:
	application/models/user_model.php