added test
added skeleton for Review-Adding-Stuff-Class
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team4
merge conflict