Clean project
Merge https://github.com/rosasuominen/SE13