Add Q6
Merge branch 'master' of https://github.com/SINF1121GR9/2013-2014