initial commit
Merge branch 'origin' of https://github.com/bassvsguitar/Programmieren-2-SS14.git into origin