Attempting to post QR code
Merge branch 'master' of https://github.com/smamol/magiccardwall_ios

Conflicts:
	MagicCardWall/MagicCardWall/LoginViewController.m