Add file1.txt
added makefile
new
added ourbranch
Merge pull request #1 from CodyMob/OurBranch

Our branch