...
[15:20:53 CDT(-0500)] <EricDalquist> and place you there
[15:22:07 CDT(-0500)] <JoeMoore> Looks good
[15:22:18 CDT(-0500)] <EricDalquist> ok ... now to get your old changes merged back in
[15:22:24 CDT(-0500)] <EricDalquist> looking at http://pastebin.com/gpqrK3DV
[15:22:31 CDT(-0500)] <EricDalquist> we want to get those top two commits
[15:22:56 CDT(-0500)] <EricDalquist> each of these commands may result in a merge conflict which would need to be resolved before moving on to the next command