Working on settings screen. App no longer crashes when user presses settings in action over flow #26
Fixed merging