Changed first line in feature_1.
Fixed conflict.
Added README.
Changed README.
Merged with master.