git sucks
grrr
to pull maddies
Merge remote-tracking branch 'MAP/master'
added some of maddies stuff
kommit again
and again
why...