Updated gitignore and collated files