Local commit so I can merge with shashank's changes
Merge remote-tracking branch 'origin/master'
Had some conflicts pulling Shashank's changes, had to checkout his code
and reset it as my branch then commit the branch to master.