Merge pull request #10 from Ejhfast/beta

Server Changes
everything in one place
merge