Sharing is Caring, merging is pergeing.

non sense at all, but fixed merging errors
Merge branch 'master' of https://github.com/honky/SoftwareProjektTUBAF2013