misc cleanup
Merge branch 'master' of github.com:zlkoh/careershire
main.css
template + login
Merge branch 'master' of github.com:zlkoh/careershire
test
test
Merge branch 'master' of github.com:zlkoh/careershire

Conflicts: