.
Merge remote-tracking branch 'upstream/master'
'Deleteing conflicts'
Merge pull request #116 from LAshokReddy556/master

Deleting Conflict changes