Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Added file to gitignore
Merge branch 'devel'
Merge branch 'devel'
Fixed another plotting bug
Merge branch 'master' into devel