added basic app
resolved conflict in gitignore