revert this!

REVERT THIS!
Merge branch 'master' of https://github.com/squshy7/epoch_server_files