added the files to the right directory
learned to use git pull to update conflicts