Remove linespread
Added last project changes
Merge branch 'master' into bachelor