merge
Merge branch 'master' of https://github.com/atomarUgent/Working-Notes-Paper

Merge
Camera ready