Timers Initial

Final laptop commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/CommandsController.java