layout of engine changed
Merge branch 'master' of github.com:joshsoftware/office_automation_employee

Conflicts:
	config/routes.rb
sign_up and sign_in form are added
sign_up and sign_in form are added
Merge branch 'master' of github.com:joshsoftware/office_automation_employee
erb view files of devise removed
Merge branch 'master' of github.com:yogeshjain999/office_automation_employee
Merge pull request #8 from yogeshjain999/master

view files of devise are changed from erb to haml