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

Conflicts:
	src/todologApp/DigitalClock.java
Merge commit '538e90dd32ce32b8cb6e2aba6a8f5f15cf8db63a' into vani's_branch