Initial Commit
Feature1
Squashed commit of the following:

commit d633297007ec7827e73ef1112d5e117bef120ab5
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:22:47 2013 -0700

    Feature1 added
Feature2

Squashed commit of the following:

commit a04ff8b8709386cea729f6beca62e740e06b33dc
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:27:37 2013 -0700

    Checkpoint again again

commit b263da95c2a59b3d05bb21137c04e70ab526d1f8
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:26:55 2013 -0700

    Checkpoint again

commit 426f9bd0f7748aea8c1802395a324ce472724f70
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:26:44 2013 -0700

    Checkpoint
Feature3

Squashed commit of the following:

commit 427a8bd4fd043127f32919b6f0fd2ba11e3c68c2
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:32:44 2013 -0700

    Checkpoint again again again

commit 1871f5b799691b1cf0b0ab6ff8ff8007dab2156e
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:32:01 2013 -0700

    Checkpoint again again

commit 7bf982e65d3eac11a39f8a7c088c26d9bf1efb3c
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:31:21 2013 -0700

    Checkpoint again

commit 7421782dabf81deb218fac93add75725211b5604
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:31:12 2013 -0700

    Checkpoint

commit 5adb9a50ad1874fec3566bce731fbe74a3ce3d7e
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:30:58 2013 -0700

    Initial Feature3 commit
Refactoring
Feature4

Squashed commit of the following:

commit 7fec42adf47cc7429b1f9a53f2088c89304ac292
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:53:31 2013 -0700

    Checkpoint

commit cd9f9ab644a3076e4fb3368f475081826fb3b421
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:53:25 2013 -0700

    Checkpoint

commit b565a93d1e67941223e5da1872bb39e721e19de2
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:52:15 2013 -0700

    Checkpoint

commit bdf1ebf06d7157d42685438145636d8cbc3e0217
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:52:05 2013 -0700

    Checkpoint again

commit a39fd6d7e46312be65d611578da14c8eb4aed733
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:51:57 2013 -0700

    Checkpoint

commit 611aa87ec9846b397044245735d0c23e050ff22e
Author: Eric Cascketta <eric.cascketta@gmail.com>
Date:   Mon Feb 18 14:51:48 2013 -0700

    Initial Feature4 commit
Feature5

Conflicts:
	code.txt
BugFix Squash

Feature4 bug fixed

Feature3 bug fixed
Feature5 hotfix

Squashed commit of the following:

commit 02ccd78c55d7d3f3d3ea8433a8a9fc7eb2d623bf
Author: Caskman <eric.cascketta@gmail.com>
Date:   Mon Feb 18 20:40:05 2013 -0700

    Try two

commit ee6eb94b348f58dd63b7a42bb641a612c7d1b09a
Author: Caskman <eric.cascketta@gmail.com>
Date:   Mon Feb 18 20:39:55 2013 -0700

    Try one
Feature6

Squashed commit of the following:

commit bf4f3bcc0b7d6d691d3478915eaec5f528f8d52d
Author: Caskman <eric.cascketta@gmail.com>
Date:   Mon Feb 18 20:45:38 2013 -0700

    Checkpoint

commit 2d378d90b017583d0c3acd848f133120a662b94a
Author: Caskman <eric.cascketta@gmail.com>
Date:   Mon Feb 18 20:40:43 2013 -0700

    Feature5 hotfix

    Squashed commit of the following:

    commit 02ccd78c55d7d3f3d3ea8433a8a9fc7eb2d623bf
    Author: Caskman <eric.cascketta@gmail.com>
    Date:   Mon Feb 18 20:40:05 2013 -0700

        Try two

    commit ee6eb94b348f58dd63b7a42bb641a612c7d1b09a
    Author: Caskman <eric.cascketta@gmail.com>
    Date:   Mon Feb 18 20:39:55 2013 -0700

        Try one

commit bf180f461b3e4fc4b8e81eb7089b4d822c862526
Author: Caskman <eric.cascketta@gmail.com>
Date:   Mon Feb 18 20:38:05 2013 -0700

    Checkpoint

commit 0ebaac526dfed5ca7f3de774da6341db34dcff01
Author: Caskman <eric.cascketta@gmail.com>
Date:   Mon Feb 18 20:37:58 2013 -0700

    Checkpoint

commit 8dc4c96c464ac44882c3be8ac505b1f3f53efaeb
Author: Caskman <eric.cascketta@gmail.com>
Date:   Mon Feb 18 20:37:50 2013 -0700

    Checkpoint

commit 799b972442916862736e5487783dbafec542f4a6
Author: Caskman <eric.cascketta@gmail.com>
Date:   Mon Feb 18 20:37:41 2013 -0700

    Checkpoint
Merge branch 'master' of github.com:Caskman/GitTest