View show updated
Merge branch 'master' of https://github.com/rafalkowalski/EmployeeManager

Conflicts:
	app/views/employees/show.haml