Added a test fike
Changed some more text
Merge pull request #2 from mcassady/feature/teaaaaaaaaa_49540361

Merged pull request #2
Feature 37 added.
More to feature 37
Merge pull request #4 from mcassady/feature/add_feature_37_49540361

Merged pull request #4
bug fix 7 done
Merge pull request #5 from mcassady/bug/bug_fix_7_49592629

Merged pull request #5
silly
Merge pull request #6 from mcassady/feature/silly_feature_49540361

Merged pull request #6
sync
Create testSyncBoth.txt
sync both
Merge remote-tracking branch 'remotes/origin/develop' into develop
Create syncBoth2.txt
sync.c test
Merge remote-tracking branch 'remotes/origin/develop' into develop
test2
Merge pull request #7 from mcassady/feature/mark_test2_49604395

Merged pull request #7
Merge pull request #8 from mcassady/develop

Develop