Merge pull request #35 from lybeck/roope

Roope
Added discussion about further work
Merge remote-tracking branch 'origin/master' into lasse
Merge branch master
Revert "Merge branch master"

This reverts commit ec6d851bffd69feb57ca0a2a60b92782cc546394.
Small layout fix
Added revision
Merge pull request #36 from lybeck/lasse

Lasse