Removed all my test code now that sam's ui code has been integrated
Merge branch 'master' of https://github.com/smamol/magiccardwall_android