Added intertrial. Added maze type choice with GUI

.