Merge pull request #1 from laurenfazah/gh-pages

style merge
first pages commit
merged changes