solving merge conflict press.html
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste
changed placeholder text for main_topic
Merge branch 'master' of github.com:rubymonsters/speakerinnen_liste