fix image and combine gesture screen
Merge pull request #36 from ECE1780PROJECT/mergeGestureSettingScreen

fix image and combine gesture screen