changes with lucas
Merge pull request #1 from Ecotrust/gh-pages

update with changes from today