resume, master up to date
Merge pull request #1 from willium/gh-pages

Keeping Master up to date