Remove all the unncessary edits
Codium latest fix conflicts
Merge branch 'master' into pranava
Fixing the layout for warnings
Merge pull request #60 from elitenomad/pranava

Pranava