ass5 math done
merge