Merge branch 'master' of https://github.com/datacarpentry/datacarpentry
suggested changes to py lesson 03
Merge pull request #3 from ladykiyenz/master

suggested changes to py lesson 03 - bug and typo fixes
Merge branch 'master' of https://github.com/datacarpentry/datacarpentry
added 02-indexing.pynd
Merge pull request #4 from choleness/master

added 02-indexing.pynd
typo fixes
Merge branch 'master' of github.com:wrightaprilm/datacarpentry
Updated Matplotlib lesson
Grammar
Merge pull request #5 from aaronreba/master

Final Matplotlib Lesson
06-merging-data: added explanatory text

Replaced the stub/outline text from the previous commit (50b17d36) with
actual text explaining how various types of joins available in panadas.
06-merging-data: stub for DataFrame concat

Stubbed out section for explaning DataFrame concatenation using pandas;
i.e., pandas-equivalents for R's cbind() and rbind() functions.
Merge pull request #6 from chenghlee/mozsprint-atx

Text for joining using pandas
Merge branch 'master' of https://github.com/datacarpentry/datacarpentry
Merge branch 'master' of github.com:wrightaprilm/datacarpentry

Conflicts:
	lessons/python/07-plotting-with-matplotlib.md
fixed minor code block formatting problems
fixed headers, other formatting hiccups
Merge branch 'master' of https://github.com/datacarpentry/datacarpentry

Conflicts:
	lessons/python/07-plotting-with-matplotlib.md
I think I got the laste merge tail