changes from server
added gitignore
removed stuff from gitignore
stuffs