Updated the files

All fits in one file now
gitignore
update