merged gitignore and project changes