Clean up
Merge branch 'master' of https://github.com/IF-JAJAGA/semantics

Conflicts:
	testToSpotlight.json
Attempt 1 of putting every part together
Merge branch 'master' of https://github.com/IF-JAJAGA/semantics