preferences contd
Merge branch 'hannah' of https://github.com/connorboyd/Fakeblock into connor