changed gitignore
changed gitignore
changed gitignore
Merge branch 'dauji' into develop
12/01/14 got rid of extra modules folder
Merge branch 'develop' into taylor
Merge branch 'develop' into takahide
12/03/14 Day/night edited and title screen added
12/3/14 working on daynight and player controller health and stamina
12/3/14 adding planet.unity.meta scene
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