More docs added
Merging conflicts
Merge branch 'gaurimishra-database'