Merge pull request #2 from Alex-Lopez/master

 first real merge to staging
Merge pull request #3 from Alex-Lopez/index.html

Merge pull request #2 from Alex-Lopez/master