Skapade en variabel
Merge branch 'Tobias'
Javadoc i klassen Card
Merge branch 'master' of https://github.com/Elmseld/sjuan
lagt till int
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
Merge branch 'Emily'

Conflicts:
	Card.java
Merge branch 'master' into Emily