Merge pull request #88 from rjynn/master

added addQbutton
Merge https://github.com/CMPUT301F14T03/lotsofcodingkitty