week 6 done
merge with algo/master