Wrapping up for the night. Merge please

Global Game Jam continues in the morning. For now, I sleep.