Merge pull request #4 from alephtwo/master

Pulling ben's version
Modal login
Merge pull request #7 from novoalg/master

Merge pull request #4 from alephtwo/master
Merge pull request #5 from alephtwo/master

New changes
Added register button to new
Merge branch 'master' of https://github.com/novoalg/cs485-1

L:q
Merge pull request #8 from novoalg/master

Wat
Merge pull request #6 from alephtwo/master

Merge pull request #8 from novoalg/master
0 is now non-employee state
Merge branch 'master' of github.com:alephtwo/cs485
Merge pull request #9 from novoalg/master

Merge pull request #6 from alephtwo/master
Redirect to root path on login failure
Merge branch 'master' of github.com:alephtwo/cs485
Merge pull request #7 from alephtwo/master

Changed employee check
Merge pull request #10 from novoalg/master

Merge pull request #7 from alephtwo/master
Merge pull request #8 from alephtwo/master

tes
Removed login route
Merge branch 'master' of github.com:alephtwo/cs485
Fixed roles
Changed item and item categories models and controllers to set role functionality