changed gitignore
Merge branch 'develop' into taylor
12/3/14 working on daynight and player controller health and stamina
12/3/14 committing before pulling develop
Merge branch 'develop' into taylor
Merge branch 'develop' into patrick
12/4/14 health at night time works
12/4/14 bugfix + displaying modules when inside
12/4/2014 Everything work
12/4/14 everything works again
Merge branch 'taylor' into patrick

Conflicts:
	Homeward/Assets/Scripts/PlayerController/PlayerController.cs
12/4/14 Now everything works
12/5/14 comments added, useless animations deleted
12/5/2014 meeting after art jam
12/5/14 saved hopefully
12/5/14 removed stuff
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
12/5/14 everything works ugh