Squashed commit of the following:

commit 3bcb35b8aa46ea35149308a6eb534c637c9cffea
Merge: 504d512 10734bd
Author: tester <test@test.com>
Date:   Tue Sep 16 21:16:45 2014 -0500

    fixed with mergetool

commit 504d512223264fe612d7dd7efd89c0740bb48459
Author: tester <test@test.com>
Date:   Tue Sep 16 21:11:04 2014 -0500

    Added a line

commit 10734bd669730a5c720136ae227c1662aca326da
Author: tester <test@test.com>
Date:   Tue Sep 16 21:09:53 2014 -0500

    wanting to try mergetool

commit 92d2e3ecb684f8b6409ab371af61992a2b101c0b
Merge: 98f7d82 dcd3336
Author: tester <test@test.com>
Date:   Tue Sep 16 21:09:11 2014 -0500

    Fixed merge

commit 98f7d8237b1cf20adb4da9c4b5b8c50e88c93e55
Author: tester <test@test.com>
Date:   Tue Sep 16 20:45:28 2014 -0500

    another merging test

commit dcd333602e223e7053b2648c877e0106c56d75b6
Author: tester <test@test.com>
Date:   Tue Sep 16 20:44:23 2014 -0500

    commiting again

commit b5f856cb6493c1b01712f5d31e541669fa6db1b6
Merge: d8d2670 a04becc
Author: tester <test@test.com>
Date:   Tue Sep 16 20:40:48 2014 -0500

    merged two

commit d8d267074b88fad52478ada45a04b2a4666dca48
Author: tester <test@test.com>
Date:   Tue Sep 16 20:29:49 2014 -0500

    second commit

commit a04beccabb84729b8376600b9beb48705bd6b0b3
Author: tester <test@test.com>
Date:   Tue Sep 16 20:27:53 2014 -0500

    first commit
Merge branch 'master' of github.com:Thisisjustatest2/thisisatest

Squashing the commits into one