done q1
done q2
improved heuristic
minor syntax fix
added tests
added solutions