Added spec files
Added text.txt file and added my name to the file
Added text.txt file and line that was not Daniel
merge master into new_feature