Adding another file
Adding file2
Adding another file, squashing one.e
Merge branch 'master' of github.com:mdolon/test_repo
Adding different text on master
Adding a new file to my cool branch
Adding content to file3
Merge branch 'new-menu-bar' of github.com:mdolon/test_repo into new-menu-bar