Added timer
Fixed
Finished timer
Fixed issues
Fixed conflicts
vic's changes
Fixed more conflicts
vic merge
Fixed errors
bleh
merge