start point
Merge branch 'master' of github.com:Fabszn/scalaIO2014

Conflicts:
	src/ContactService.scala
remove semi colon