Merge branch 'feature_1'
Created feature2.
Modified feature2.
Added some code in feature_1.