fixed get_state()
Merge branch 'master' of github.com:hall5714/Freedom-Galaxy
units dont have no endurance no more
Merge branch 'master' of https://github.com/hall5714/Freedom-Galaxy
adding planets to test_client.py
Merge branch 'master' of github.com:hall5714/Freedom-Galaxy
Justin wants this
add pass to Character method
removing meta data from return object
Question prisoner removed
Merge branch 'master' of https://github.com/hall5714/Freedom-Galaxy
added missions/races
fixing conflict in missions.yaml
lost track
Merge branch 'master' of https://github.com/hall5714/Freedom-Galaxy
my updates
merge fixes