All timers are integrated
Revert "some minor changes"

This reverts commit 5ca71eb569a0a32a3287fc0bf2399cb710838737.
Merge pull request #35 from archieherbias/master

All timers are integrated
Merge remote-tracking branch 'upstream/master'

Conflicts:
	application/views/template.php