Yes
All endpoints working
Merge remote-tracking branch 'origin/XavierBranch'

Conflicts:
	RisingSun.py