Merge pull request #1 from barrypevans/master

Merge pull request #1 from DNDJava/master
Fixed Admin /roll to work with public + private
Revert "Fixed Admin /roll to work with public + private"

This reverts commit bea700279213e835b02e4abc75b9eee1134f873e.
/roll now works with public/private admin side
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/login/LoginConfirmation.java