add feature 1
added feature 2
Added addtional features
Merged feture2_additoinal into master
Added feature 3
Added fix 1

Conflicts:

	file1.txt