Merge branch 'master' into Saumya
commit
commit changes for specials
commit styling for error message
Merge branch 'Saumya'