Allow user to input time (closes #4)
Merge branch 'master' of https://github.com/geekarist/timebox

Conflicts:
	timebox