lotsa changes
Merge branch 'master' of https://github.com/csirac/project3

Conflicts:
	Project3.scala