adding changes to file1.txt
fixing file1.txt
added file2.txt -- fixed file1.txt
really added file2.txt
Merge branch 'ryan_branch'

Merging ryan_branch to master.