added: meilenstein 3, favoriten.html, main.css, fav.css
Merge remote-tracking branch 'origin/master'