Revert to working everything
Merge branch 'cardnest' of https://github.com/Ecobbold/cardcatcher into cardnest