changed linewidth from 4 to 2 in plot_types/grped_distr.py
fixed conflict
Merge branch 'doc' of github.com:zyxue/xit into doc
doc working now