Some style and stuff
Something
Merge branch 'Anna'
Some stylechanges
Merge branch 'Andreas'