switched add transitions and add assertions to use predicates
Merge branch 'robDev'

Conflicts:
	src/simulator/DOM.java