Added spec files
Added text.txt file and added my name to the file.
Added text.txt file and line that was different from other commit.
Merged master into new_feature.