Merge conflict resolved
Merge branch 'master' of https://github.com/NIT-Warangal/SCorner