Fehler
erge branch 'eigenheim' of https://github.com/axks/ebshackathon into eigenheim
Changed gitignore
added dbs
partially successsful merge
Merge branch 'master' into eigenheim
resolved conflict
 ha
resolved conflict
Finished news mail
resolved conflict
Merge branch 'master' of https://github.com/axks/ebshackathon