Merge pull request #1 from lacaulac/gh-pages

Update
Updated something
Updated something
Updated something
Updated something
Updated something
Updated something
update
Merge pull request #2 from lacaulac/master

Update