new files for feature2
updated files for feature2
remove absolete file
Merge branch 'feature2'