Cindy made minor change to sidebar.html.erb
Merge branch 'master' of https://github.com/cindybain/HR-Recruitment-Sys

Conflicts:
	log/development.log
	tmp/pids/server.pid