PLEASE CHECK FOR MERGE CONFLICTS BEFORE YOU PUSH!!!!!!!!! DON'T PUSH WITHOUT CHECKING FOR CONFLICTS!!!
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client