added A Programmer's Guide to Data Mining using Python
fix conflict