beginnings of drawing markers
Merge branch 'master' into FourierSeries

Conflicts:
	infinite.py