initial commit
add ipynb and readme for github
fix conflicts