Merge pull request #2 from JeyB88/master

ein pull request
Merge pull request #1 from dasBKB/master

Blubber
Topic + Test
Merge pull request #3 from JeyB88/master

neues Update
- courses mit wbt hinzugefügt
- noch Problem mit routing (start und destroy geht auf show!?!)
- license added
Merge pull request #4 from MerkleB/master

adf
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
Merge pull request #2 from dasBKB/master

title