time bug

gahhhhhh
Merge branch 'master' of https://github.com/redsoxfantom/Gerrymander

Conflicts:
	Unity App/Library/CurrentLayout.dwlt
	Unity App/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unity App/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unity App/Library/assetDatabase3
	Unity App/Library/metadata/02/021003903ad9df048a95ff5078a2f615
	Unity App/Temp/__EditModeScene
	Unity App/Unity App-csharp.sln
	Unity App/Unity App.sln