a new app
welcome index
fix confilcts after git pull