kdjjsjdswq
Merge branch 'master' of github.com:minillinim/mikezbioscripts

Conflicts:
	map_plot_pipe/makeSam.py
Merge remote-tracking branch 'origin/master'
merge a lot
Merge remote-tracking branch 'origin/master'