Forced commit
Fixed merge conflict
Merge branch 'master' of github.com:ErwinHaasnoot/axongame
Merge branch 'master' of github.com:ErwinHaasnoot/axongame
Merge branch 'master' of github.com:ErwinHaasnoot/axongame
Changed analysis script to run in one go, now also runs on cloud9 due to different backend used by matplotlib
Forgot to make a small change