edited some sublime stuff
fixed merge conflict
started work on experiment 2