layout of engine changed
Merge pull request #6 from Shwetakale/master

Test cases updated
Merge branch 'master' of github.com:joshsoftware/office_automation_employee

Conflicts:
	config/routes.rb
sign_up and sign_in form are added
Seed data for role table 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
seed data created for role model
specs for controller are created
specs for controller are created

specs for SessionsController, PasswordsController and ConfirmationsController
Merge branch 'master' of github.com:yogeshjain999/office_automation_employee
Merge pull request #9 from yogeshjain999/master

specs for controller are created
Merge https://github.com/joshsoftware/office_automation_employee

Conflicts:
	app/assets/stylesheets/office_automation_employee/application.css
	app/controllers/office_automation_employee/companies_controller.rb
	config/initializers/simple_form.rb
	config/initializers/simple_form_bootstrap.rb
	config/routes.rb
Company registration completed
Conflicts:
	app/controllers/office_automation_employee/companies_controller.rb
	app/controllers/office_automation_employee/registrations_controller.rb
	app/views/office_automation_employee/devise/registrations/new.html.haml
	config/routes.rb