tmp
Merge branch 'master' of https://github.com/makikof/cs247-2104-p3
final
functional p2