updated version of main
Merge branch 'master' of https://github.com/jmankoff/data

Conflicts:
	Assignments/jmankoff-byte4/main.py
updated after lecture
renamed x to x_scale and debugged.
more queries