mergecommit2
fixed merge conflicts
changed title to flattie
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team2
changed name to flattie