Changed Time-class to C.Elias
Merge branch 'back-before-add-file' of github.com:davidjosefson/GIT-labb into back-before-add-file

Conflicts:
	src/p2/Time.java