Merge branch 'master' of github.com:olgabot/prettyplotlib

Conflicts:
	examples/.ipynb_checkpoints/plot-checkpoint.ipynb
	examples/plot.ipynb
Merge branch 'master' of github.com:olgabot/prettyplotlib

Conflicts:
	examples/.ipynb_checkpoints/plot-checkpoint.ipynb
	examples/plot.ipynb
fixing examples nonsense