created difelice.txt
Roja is in the house
David Wu
Nive is here
Merge branch 'feature_dick' into dev