Merge branch 'master' of https://github.com/IllSc/SiJamil

Conflicts:
	app/routes.php
	app/views/login.blade.php
Merge branch 'master' of https://github.com/IllSc/SiJamil

Conflicts:
	app/routes.php
	app/views/login.blade.php