New version of the site
Merged the gitignore file