Makefile check
changed nultiplication to if
Merge branch 'master' into 'master'

ex6

Removed multiplication by binary value, added if condition instead -> noticeable speedup.
Added -DNDEBUG - speedup by a third in some cases. Cheating, though.
Merge branch 'master-gitlab'