Added spec files
Added text.txt file and added text
Added new text to text.txt and line that did not match master
merged master into new_feature