annotate plot
fix conflict by keeping alix's

Merge branch 'master' of https://github.com/gitelman/BigData

Conflicts:
	conflict/our-plot.png