Changed file structured
Added a blinkig cursor to the app
fixed conflict