Skapade en variabel
Merge branch 'Tobias'
Javadoc i klassen Card
Merge branch 'master' of https://github.com/Elmseld/sjuan
lagt till String data
Merge branch 'Emily'
Merge branch 'master' of https://github.com/Elmseld/sjuan
Controllers konstruktor
Merge branch 'master' of https://github.com/Elmseld/sjuan

Conflicts:
	DataBase.java
Merge branch 'Tobias'
Merge branch 'master' of https://github.com/Elmseld/sjuan
Förklaring i card
Merge branch 'Emily'

Conflicts:
	Card.java
Skapade en Gui-klass och la till tillfälliga bilder på kort
Modifierade Controller klass
Skapade återstående klasser i klassstruktur
Merge branch 'Tobias'
Merge remote-tracking branch 'origin/master' into Anna