fix bug in calculation of q (it was an integer division)
Merge branch 'master' of https://github.com/nicolas-fricke/semmul2013-group1