Added ruby files
Changes made to ruby file
Modified greeting.txt file
removed lock file
Changes made to greeting file
Removed unneccessary file
Merged conflits