Merge pull request #2 from laurenfazah/gh-pages

fixed bugs
merging