Seb's part after the first day  of woooooooooooooOooooOOOOOOOoooork
Merge branch 'master' of https://github.com/scorthes/CSProject

Conflicts:
	toolc/src/main/scala/toolc/repl/Environment.scala
	toolc/src/main/scala/toolc/repl/Evaluator.scala