Seed data for role table added
seed data created for role model
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
Delete Screenshot_from_2014-01-20_11_17_51.png
Delete Screenshot_from_2014-01-20_11_17_51.png
Company registration completed
Merge branch 'master' of github.com:Shwetakale/office_automation_employee
Test cases updated
Merge pull request #10 from Shwetakale/master

Company registration completed