Trying to solve the problem with the tables showing up in my view.
Merge pull request #32 from Reservit/benjamin

added settings view and refactored code in users controller, user model,...
Merge branch 'master' into omar
Still working on getting only the tabbed views working, but the major features are working correctly. Bug fixes will come starting tomorrow.
Have the table working closely to the way I want it to. Will work on JavaScript to have the table show only certain room names
Adding security.
Added tablesorter. Thank you, tablesorter.
Merge pull request #33 from Reservit/omar

Omar
fixed merge conflicts