Added spec files
Added text.txt and edited file
Added text.txt with new line of text
Merged master into new_feature