Move demo stuff into demo folder
Merge branch 'cblank' into jnoir

Conflicts:
	traffic/src/tt2/Pair.java