Revert "fixed dillon's problems"

This reverts commit 7cb082df9f3ab6ce2ac2c4e7b8e86a859e972731.
fixed Everyones problems
reverted to previous commit: 7cb082df9f3ab6ce2ac2c4e7b8e86a859e972731
Merge branch 'master' of https://github.com/woodbury/Musha
merged User.java conflicts
Added checkboxes to main table...not updating back end yet.