adds timer to main scene
spawn players on a random position
Merge branch 'master' of github.com:meredrica/agj2014

Conflicts:
	Assets/Scenes/Level_01.unity
Merge branch 'master' of github.com:meredrica/agj2014

Conflicts:
	Assets/Scripts/SceneSetup.cs
fix merge stuff
Merge branch 'feat-timer'