Finish timer function
Note that the input parsing is giving some problems, so it will not parse input for the timer yet
This code does compile.
Merge branch 'master' of https://github.com/exrook/swic
Fixes some stuff.

Conflicts:
	main.cpp