Staff Appraisal
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/routes.rb
Merge remote-tracking branch 'upstream/master'

merging
Merge pull request #183 from azimadnan/master

Staff Appraisal