gitignore changes
gitignore resolve conflicts

Merge branch 'master' of github.com:srvanderplas/animint

Conflicts:
	.gitignore