git-learn commit.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Fixed problem with only one column of data. Docstrings and TODO:s.