fixed some rubocop issues
fixed issue with wrong answers
merged conflicts from origin/master
Merge branch 'master' of github.com:secretBears/QAPI

merged master