Merge pull request #2 from dasBKB/master

asdf
Blubberblaa
Merge branch 'master' of https://github.com/MerkleB/WBTS

Conflicts:	MasterlyMate/app/models/topic.rb

-==Merged Single Parts of MM==-
Merge pull request #5 from MerkleB/master

mein Titel