m

1.3

---
Just committing
Merge github.com:iwabuchiken/Time_calculator

Conflicts:
	bin/p1_E_5_multiple_sources.jar