init commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/lists.py
	src/quadratic.py