cameraShake for earthquake
userprefs minor update
Merge remote-tracking branch 'GitHub/Lauren_branch' into Dylan