Changed files in Branch Two
File 1 into Branch Two individually
Also File 2
Squashed commit of the following:

commit b476ffcce2b5a10adaec304ea558a8294d8e9bac
Author: sfjpk31 <otjpk31@gmail.com>
Date:   Tue Jul 23 17:25:41 2013 -0700

    Also File 2

commit 426ae9667bc15514690d04ba895e4644dd83ef9d
Author: sfjpk31 <otjpk31@gmail.com>
Date:   Tue Jul 23 17:24:46 2013 -0700

    File 1 into Branch Two individually

commit 3fa16c6bcfe33564feb184618638ce27f6fbc6fa
Author: sfjpk31 <otjpk31@gmail.com>
Date:   Tue Jul 23 17:10:16 2013 -0700

    Changed files in Branch Two
First commit
Second commit
Merge branch 'Two'

Conflicts:
	File1.txt
	File2.txt