message
Merge pull request #1 from jknightihiji/branch1

We added shit to file2
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
Merge branch 'master' of github.com:jknightihiji/testrepo into branch2

Conflicts:
	file2