ronn's changes
Merge branch 'master' of https://github.com/rlamostre0/hack-server-master