70% done paragraph 1
Merge branch 'master' of https://github.com/christopherKorpela/tepra2015.git