Now the memory game works again.
Fixed layout for memory.
Merge branch 'development' of https://github.com/Hasselmannen/sleepfighter into development

Conflicts:
	application/src/se/chalmers/dat255/sleepfighter/challenge/MemoryCardView.java