Fixed merge conflicts in card_model.html. This will be moved into src directory later, but for now it is at least consistent between branches.
Fixed merge conflicts in card_model.html. This will be moved into src directory later, but for now it is at least consistent between branches.

Cardshifter/HTML-Client,SirPython/HTML-Client,Cardshifter/HTML-Client,SirPython/HTML-Client