Fixing my failed git rebase attempts
Fixing my failed git rebase attempts

Conflicts:
	ggplot/geoms/geom.py

bitemyapp/ggplot,udacity/ggplot,benslice/ggplot,mizzao/ggplot,mizzao/ggplot,ricket1978/ggplot,andnovar/ggplot,benslice/ggplot,ricket1978/ggplot,xguse/ggplot,smblance/ggplot,assad2012/ggplot,Cophy08/ggplot,xguse/ggplot,wllmtrng/ggplot,kmather73/ggplot