12/5/14 saved hopefully
12/5/14 removed stuff
12/5/14 everything works ugh
Merge branch 'taylor' into patrick

Conflicts:
	Homeward/Assets/Scenes/Planet.unity