redo Figure 2 (comparison of predictions)
Merge branch 'master' of http://github.com/dedan/master
tuned fig. 3 and 4
Merge branch 'master' of http://github.com/dedan/master
small changes

* bring back correct input
* bring back old paths
* remove commented out code
Merge pull request #1 from Huitzilo/first_submission

merge in changes from micha