Here are things
Merge branch 'master' of https://github.com/bkelsey2216/Advogato

Conflicts:
	datasetMethods.py