spring cleaning/merging packages
adding gitignore
pulling before pushing