Added spec files
added text.txt file and added my name to the file
changed the file to talk about what it had before I changed it
Merged master into new_feature branch