merge conflict away
Merge branch 'master' of https://github.com/alutman/Epoch_Converter

Conflicts:
	src/Program.java