add ipynb / .gitignore
resolve conflicts
resolve conflict