Created draft of feature 3.
Modified test2 for feature 3.
Added some additional information to test2.txt
Merge branch 'feature-3'
New modification on master; attempt a conflict.
Modfication for feature 3; attempt conflict.
Merge branch 'feature-3'