clean up stage 1
Merge branch 'master' of github.com:zlkoh/careershire

Conflicts:
	application/views/layout/home.blade.php
	application/views/layout/level2.blade.php
	less/base.less
	public/css/main.css