Merge branch 'master' of https://github.com/upjohnc/Sana

Conflicts:
	Sana Solution.py
t