fix dupl. files
Merge branch 'Stanley's_Branch' into Ben's_branch

Conflicts:
	src/todologApp/DigitalClock.java