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

Conflicts:
	public/js/site.js