Modified python file
***
Modified ruby script
Resolved conflicts