test
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/clients/edit.blade.php
Merge remote-tracking branch 'upstream/master'
Updated login page.
Merge pull request #64 from raziraz/master

Updated login page