Merge branch 'master' of D:\AIP\HAW_SS13_AI with conflicts.
Merge remote-tracking branch 'origin/master'
aip 4 struktur für teil 1
aip4teil1 struktur