first pages commit
merged changes
Merge pull request #2 from laurenfazah/gh-pages

fixed merge conflicts