wrote some stuff
Merge branch 'master' of https://github.com/steinsholt/Thesis-Proposal