Added some more code
Merge branch 'master' of https://github.com/vmalarcon/scala99

Conflicts:
	src/Lists.scala

Merged changes from win7