Removed windows line endings
Scene saved for 2nd floor camera positioning
Squashed earthquake-def
Added computer back in
Extra curly bracket
Removed duplicate conversations
Fixed more convos
Merge pull request #58 from rcatlin/new-earthquake-def

Squashed earthquake-def
merge master