debugged military time-JP
debugging getMilitaryTime() in Time-JP
debugging getMilitaryTime() in Time-JP
Merge branch 'latest'

Conflicts:
	Driver.java
conflicts resolved-JP
Merge branch 'latest'