before merge
Merge branch 'master' of https://github.com/nahomh/6.945-Final-Project
Merge branch 'master' of https://github.com/nahomh/6.945-Final-Project
tests broken
merging with Malcolm
Merge branch 'master' of https://github.com/nahomh/6.945-Final-Project
inversions working