Merge pull request #2 from chalenge/master

Documentation
Merge pull request #6 from iHub/master

Merge pull request #2 from chalenge/master