Color changes
Merge branch 'develop' of http://github.com/Bergmam/DAT255 into mybranch
Merge branch 'develop' of http://github.com/Bergmam/DAT255 into mybranch
remove card funktion in view
merge
Merge branch 'develop' of http://github.com/Bergmam/DAT255 into develop