Merge remote-tracking branch 'origin/master'

Conflicts:
	data_graphmaker.py
	dummy_data_creator.py
graphmaker.py turned into a single function, working, with docstring and comments finished!
undo merge duplicate files