We added some shit to file4 and overwrote some stuff in file1
Merge pull request #2 from jknightihiji/branch3

We added some shit to file4 and overwrote some stuff in file1