Merge pull request #2 from alephtwo/master

User stuff
Delebota
Merge pull request #5 from novoalg/master

Merge pull request #2 from alephtwo/master
Merge pull request #3 from alephtwo/master

New tests
Configured database secrets.
Merge branch 'master' of github.com:alephtwo/cs485
Changed fonts...
Reworked fonts again.
Fixing roles for users, items, item categories
Merge pull request #6 from novoalg/master

Added roles
Removed turbolinks.
Upgraded to Rails 4.1.7
Gemfile
Merge branch 'kubicect' of github.com:alephtwo/cs485 into kubicect
Merge branch 'kubicect'
Merge branch 'delebota'