Merge branch 'master' into config-and-serialization
Merge branch 'master' into config-and-serialization
starting json-based config i/o
Merge branch 'master' into config-and-serialization
implementing json config loading
implemented json config saving
Merge branch 'config-and-serialization'