testing another commit
REsolve conflict
Merge branch 'gh-pages'
Adding git ignore file
Header adding to the site