First with GITHUB
GitHub app sync
Merge branch 'master' of https://github.com/Abhisheknga/employee-manegement

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/controllers/employees_controller.rb
	app/models/department.rb
	app/models/employee.rb
	app/views/departments/_form.html.erb
	app/views/departments/show.html.erb
	app/views/employees/_form.html.erb
	app/views/employees/index.html.erb