added a line w/ my new feature
Merge branch 'newfeature1'