fixed some shmall errors, started on JSON->model parser
fixed merge conflicts
Merge branch 'newdemo' of github.com:svanschooten/genesis into newdemo
made basic JSON->model convertor (Network.fromJSON)
Merge branch 'newdemo' of github.com:svanschooten/genesis into newdemo
fixed parser, should do the very basics