mofified a couple files for the merge
added new line to newfeature
added more lines to a for newfeature
added some lines
Merge branch 'newfeature'

Conflicts:
	a
	c
added some lines in v for secondfeature