Merge pull request #1 from ZomgPonies/master

Updating My Branch
Admin Room Hotfix
Merge pull request #24 from SamCroswell/master

Admin Room Hotfix