Initial commit
Hello World!
Hello World was tested. "Hello-World" name changed to "sandbox". "sandbox" will be used for tests from now on.
Added test file
Hello-World was modified to sandbox. This folder will be used for tests in general from now on.
Merge branch 'master' of https://github.com/marcos-pereira/ees-projekt
Merge branch 'master' of https://github.com/marcos-pereira/ees-projekt
test in phil-test.txt
merge test
Simultaneous test
ugly merge
preparing new test
change file folder
phil-test.txt moved to sandbox
new test with diffs
simulataneuous test 2 - mergetool
lines merged
preparing new test
changes to philip mergetool test
solve merge problem