added subtree _logging
removed old git package as it's now included as subtree bobgit
removed PyScripter lock files
tinkering with bobgit package (non-sense since it's gonna get removed later on)
fixed imports and main.py
moved tests to separate folder
moved tests to separate folder
removed old tests
removed old tests
began tests on the campaign module
began tests on the campaign module
still adding testing for conflict resolution
still adding testing for conflict resolution
build a very basic test framework
build a very basic test framework
merged new _logging version and fixed conflicts
merged new _logging version and fixed conflicts
added some conflict resolution tets
added some conflict resolution tets
pre-cleaning