first commit
Merge github.com:karlaking/thesisResearch