Jobbade 15/9
Merge branch 'master' of https://github.com/danieledin/ioopm14

merge
imer