Added Timer
Merge branch 'master' of https://github.com/eshalkowski/platformer

Conflicts:
	2dPlatformer/2dPlatformer-csharp.sln
	2dPlatformer/2dPlatformer.sln
	2dPlatformer/2dPlatformer.userprefs