updating .gitignore and notebook
formatting
added matplotlib
Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.py
added matplotlib