Decks fertig, Cards Fertig
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/model.js
Decks fertig, Cards Fertig, Studys fertig