add ipynb / .gitignore
resolve conflicts
resolve conflict
Merge pull request #1 from c3h3/master

please merge