Scroll after changing settings
Merge branch 'iteration_3' of github.com:jdavis/nebulous-adventure into iteration_3