added sijax
added sijax
broken sijax
Merge branch 'old-state'

Conflicts:
	runLocally.py
tried fixing things
further broke it