cleaned some empty space
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/testingWorksheet.sc
Merge branch 'master' of C:\Users\Xavi\Documents\GitHub\scala_project1 with conflicts.
 problem 2 solved