format
Merge branch 'master' of github.com:zlkoh/careershire

Conflicts:
	application/views/employer/archived.blade.php