Updating from the repo
merging new updates
adding back the root gitignore