Merge attempt
Merge

Conflicts:
	graph.py

Updated graph ticks