progress on pi
finished pi
getting pull
Merge branch 'master' of https://github.com/blackdoor/Data-Mining
rawr
handling a rebase?
Merge commit 'HEAD@{1}' into oscarthesquid

Conflicts:
	hw2/hw2.py