abcd
Fixed conflitcts
Merge pull request #16 from Nirosan/master

doc-web