card stuff
Merge branch 'master' of https://github.com/Nerixel/418-Teapots

Conflicts:
	app/controllers/cards.php