adding feature 2
merging feature2 into dev