Eders commit 2
Merge branch 'master' of https://github.com/natalijk/SoftEng2013