Moar CSS!
Merge remote-tracking branch 'origin/master'

Conflicts:
	CardFunctions.php
	src/css/style.css
Moar CSS!