Merged Orm into single file, server and test_client currently working
Merge branch 'master' of https://github.com/hall5714/Freedom-Galaxy