Refactoring lots of stuff in Memory and cleaning up Main
Merge branch 'master' of https://github.com/chickendelicious/Brocator.git