Added html documentation and .rst files. Added some comments
Updated html documentation
Merge branch 'develop'