added feature 1
addes feature 1 again
addes feature 2 again
merged feature1 and feature2