trying something
Merge branch 'gh-pages' of github.com:mbertino/Prac-Responsive-Website into gh-pages
fixing the conflicts