12:16
Merge branch 'master' of https://github.com/hsazzad/Elog

Conflicts:
	application/controllers/login.php