changes to queue
Merge branch 'master' of https://github.com/SidIcarus/Project2_TSA.git

Conflicts:
	src/Queue.scala
Merge branch 'master' of https://github.com/SidIcarus/Project2_TSA.git

Conflicts:
	src/Scanner.scala