Nuku/Flexible-Survival — pull request #874 by TigerStripes (2013-08-14 00:37:23+00:00)
Title: Update

Pet stuff and separating out the settings menu.