gitignore changed
david fixes
Merge branch 'master' of github.com:obrien/msc_thesis