work working work
j&d's progress push
handling a rebase?
Merge commit 'HEAD@{1}' into oscarthesquid

Conflicts:
	hw2/hw2.py
work
working work
some more work
dear god help me now
Merge branch 'oscarthesquid'
Merge branch 'master' of https://github.com/blackdoor/Data-Mining

Conflicts:
	hw2/hw2.py