added keyboard controls
fixed merge conflict