12/3/14 working on daynight and player controller health and stamina
Merge branch 'develop' into patrick
12/4/14 health at night time works
Merge branch 'taylor' into patrick

Conflicts:
	Homeward/Assets/Scripts/PlayerController/PlayerController.cs
12/5/14 art meeting done
12/5/14 got rid of merge conflicted files
Merge branch 'taylor' into patrick

Conflicts:
	Homeward/Assets/Prefabs/Modules/Connector Module/Connector Module.prefab
	Homeward/Assets/Prefabs/Modules/Habitat Module/Habitat Module.prefab
Merge branch 'taylor' into patrick

Conflicts:
	Homeward/Assets/Scenes/Planet.unity
12/5/14 new commit
12/5/14 everything works
12/6/14 bed has collider, working on health
12/6/14 light added
12/6/14 stamina tied to daynightcontroller
12/6/14 durability on modules, player is safe inside modules
12/6/14 added scene and changed prefabs
12/7/14 merge taylor with patrick
12/7/14 saved scene
Merge branch 'taylor' into patrick