bleh
Merge branch 'master' of github.com:strubell/cs689-class-proj
refactoring
merge