Working q5 mapper code; possibly fixed q4 error
Merge branch 'master' of https://github.com/TeamSYC/phase3