Completes changes on windows.

Issue: #47

Conflicts:
	include/timer.h
	src/Timer.cpp