diff --git a/.idea/misc.xml b/.idea/misc.xml
index 79af6dd..efc38bd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/.idea/sonarlint/issuestore/0/3/030ed2ccb712537825891dfda283154162e458a8 b/.idea/sonarlint/issuestore/0/3/030ed2ccb712537825891dfda283154162e458a8
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/1/0/10a03f31c4dce92cb371e761ce9429428bb6c176 b/.idea/sonarlint/issuestore/1/0/10a03f31c4dce92cb371e761ce9429428bb6c176
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/6/4/64876b8bea138a82803d0008198401e04ab468aa b/.idea/sonarlint/issuestore/6/4/64876b8bea138a82803d0008198401e04ab468aa
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/6/b/6bc361fab678f74f7da63b229ace2fc9d3130980 b/.idea/sonarlint/issuestore/6/b/6bc361fab678f74f7da63b229ace2fc9d3130980
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/7/0/7002b66a5a43fcbd6638cc9e9a8e26007bcd876e b/.idea/sonarlint/issuestore/7/0/7002b66a5a43fcbd6638cc9e9a8e26007bcd876e
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/8/8/88a9255124c95bdc913197c120a8d560edc59c8e b/.idea/sonarlint/issuestore/8/8/88a9255124c95bdc913197c120a8d560edc59c8e
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d b/.idea/sonarlint/issuestore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/9/0/909762385fc6eb20f922a91c6865741308b57f2c b/.idea/sonarlint/issuestore/9/0/909762385fc6eb20f922a91c6865741308b57f2c
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/9/6/961a371e72f8b2d2283f5377d41c5945b01f46ed b/.idea/sonarlint/issuestore/9/6/961a371e72f8b2d2283f5377d41c5945b01f46ed
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/9/f/9fe84ebb15faf917b7def6236dba604453cc61e0 b/.idea/sonarlint/issuestore/9/f/9fe84ebb15faf917b7def6236dba604453cc61e0
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/a/4/a413a8e92e5f60bcdd49831ce09ae50272942e7e b/.idea/sonarlint/issuestore/a/4/a413a8e92e5f60bcdd49831ce09ae50272942e7e
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/a/d/adba887bb96afb21dce969ef60ba276c068da22a b/.idea/sonarlint/issuestore/a/d/adba887bb96afb21dce969ef60ba276c068da22a
new file mode 100644
index 0000000..6114442
--- /dev/null
+++ b/.idea/sonarlint/issuestore/a/d/adba887bb96afb21dce969ef60ba276c068da22a
@@ -0,0 +1,5 @@
+
+o java:S120"ZRename this package name to match the regular expression '^[a-z_]+(\.[a-z_][a-z0-9_]*)*$'.(⨈
+V
+java:S1854 "@Remove this useless assignment to local variable "nameSpelling".(Nj
+E java:S106"+Replace this use of System.out by a logger.(
\ No newline at end of file
diff --git a/.idea/sonarlint/issuestore/a/e/ae9ddf453f55affea2d6b9e3973cac1eb2efb4e1 b/.idea/sonarlint/issuestore/a/e/ae9ddf453f55affea2d6b9e3973cac1eb2efb4e1
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/b/0/b04578cffb47b1e57970601a0cacef6081245859 b/.idea/sonarlint/issuestore/b/0/b04578cffb47b1e57970601a0cacef6081245859
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/b/4/b4a0b63ce8560bbc5de0f9995c20cc861dc2adb3 b/.idea/sonarlint/issuestore/b/4/b4a0b63ce8560bbc5de0f9995c20cc861dc2adb3
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/b/b/bbf202272a96de5cd6b6828ffdc55fb3ce45289c b/.idea/sonarlint/issuestore/b/b/bbf202272a96de5cd6b6828ffdc55fb3ce45289c
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/d/a/da101d83b6b65667373de548a9f5004071396234 b/.idea/sonarlint/issuestore/d/a/da101d83b6b65667373de548a9f5004071396234
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/f/0/f0e0f9cec86fe4b939ae22be5264c758801eb28f b/.idea/sonarlint/issuestore/f/0/f0e0f9cec86fe4b939ae22be5264c758801eb28f
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/f/e/fe03b4fd3afe162c6e01309b98a22588e093d274 b/.idea/sonarlint/issuestore/f/e/fe03b4fd3afe162c6e01309b98a22588e093d274
new file mode 100644
index 0000000..eaddbd7
--- /dev/null
+++ b/.idea/sonarlint/issuestore/f/e/fe03b4fd3afe162c6e01309b98a22588e093d274
@@ -0,0 +1,5 @@
+
+]
+java:S1854
+"@Remove this useless assignment to local variable "nameSpelling".(Nj8η1
+L java:S106
"+Replace this use of System.out by a logger.(8Ϸ1
\ No newline at end of file
diff --git a/.idea/sonarlint/issuestore/f/f/ffaeea8ef322c1ce32b030cab72558052d2a67f1 b/.idea/sonarlint/issuestore/f/f/ffaeea8ef322c1ce32b030cab72558052d2a67f1
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb
new file mode 100644
index 0000000..877b0b8
--- /dev/null
+++ b/.idea/sonarlint/issuestore/index.pb
@@ -0,0 +1,62 @@
+
+S
+#.idea/sonarlint/issuestore/index.pb,9/f/9fe84ebb15faf917b7def6236dba604453cc61e0
+]
+-.idea/sonarlint/securityhotspotstore/index.pb,8/8/88a9255124c95bdc913197c120a8d560edc59c8e
+L
+git-branch-rebasing-task.iml,9/6/961a371e72f8b2d2283f5377d41c5945b01f46ed
+9
+ README.md,8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
+:
+
+.gitignore,a/5/a5cc2925ca8258af241be7e5b0381edf30266302
+A
+src/FeatureA.java,8/9/894d4e33067e340254905e7bf35220d38a4263e8
+w
+G.idea/sonarlint/issuestore/a/e/ae9ddf453f55affea2d6b9e3973cac1eb2efb4e1,6/2/6248197ca7a44d8bc42b5bd6cd80cd6e99143261
+
+Q.idea/sonarlint/securityhotspotstore/0/3/030ed2ccb712537825891dfda283154162e458a8,c/9/c9b3776f6ce02f40809b5a2883142fcb439b1357
+
+Q.idea/sonarlint/securityhotspotstore/d/a/da101d83b6b65667373de548a9f5004071396234,4/9/498db7fa72e22981104129d8b731ec77e0d45c35
+
+Q.idea/sonarlint/securityhotspotstore/6/4/64876b8bea138a82803d0008198401e04ab468aa,a/5/a5fd33cdefef73f893557e24a010c7f884013f96
+
+Q.idea/sonarlint/securityhotspotstore/6/b/6bc361fab678f74f7da63b229ace2fc9d3130980,b/8/b865a30afc0ea49246217e641d4693db7d27c76a
+
+Q.idea/sonarlint/securityhotspotstore/7/0/7002b66a5a43fcbd6638cc9e9a8e26007bcd876e,4/6/463af4e1f5421c687c9cd8f970d12aa4b7254c54
+
+Q.idea/sonarlint/securityhotspotstore/a/e/ae9ddf453f55affea2d6b9e3973cac1eb2efb4e1,e/3/e36d3b35b0aa033dfcf067b2cd16117a306b1e80
+
+Q.idea/sonarlint/securityhotspotstore/f/0/f0e0f9cec86fe4b939ae22be5264c758801eb28f,f/c/fc51aad2f1ebe72ffedf49fa3dfea24b513ff6fe
+
+Q.idea/sonarlint/securityhotspotstore/f/f/ffaeea8ef322c1ce32b030cab72558052d2a67f1,f/3/f35b2740cd738d7308d96a63c804bf41f1389ec6
+w
+G.idea/sonarlint/issuestore/9/0/909762385fc6eb20f922a91c6865741308b57f2c,c/e/ce7799643a95553c6bee1d403d6cb738907a7f2c
+
+Q.idea/sonarlint/securityhotspotstore/9/6/961a371e72f8b2d2283f5377d41c5945b01f46ed,5/c/5c797c4c838cf559f2351fbcbd257ff369dcebe8
+w
+G.idea/sonarlint/issuestore/9/6/961a371e72f8b2d2283f5377d41c5945b01f46ed,3/1/317eebb71e91d4aa7c9073faee2c4d6399e8bac3
+w
+G.idea/sonarlint/issuestore/b/0/b04578cffb47b1e57970601a0cacef6081245859,7/2/72d60672c1f4ee9fd0ef10acd6189a6dce5f9e9f
+w
+G.idea/sonarlint/issuestore/b/b/bbf202272a96de5cd6b6828ffdc55fb3ce45289c,8/4/84e95bd0ea795e5307464eb72e7bd95d9f673c00
+w
+G.idea/sonarlint/issuestore/0/3/030ed2ccb712537825891dfda283154162e458a8,0/c/0c3c05c2b18505590a392e5404b4d055f24cf3dd
+w
+G.idea/sonarlint/issuestore/d/a/da101d83b6b65667373de548a9f5004071396234,5/0/507f2c20d93b4e99b2aac0dbb66ba73cc2b9414f
+w
+G.idea/sonarlint/issuestore/6/4/64876b8bea138a82803d0008198401e04ab468aa,d/3/d34c834095f0696feda374867b7919b9fc479801
+w
+G.idea/sonarlint/issuestore/6/b/6bc361fab678f74f7da63b229ace2fc9d3130980,2/e/2eff36c1f7e804d5ff3d50f9f26d58da27834004
+w
+G.idea/sonarlint/issuestore/7/0/7002b66a5a43fcbd6638cc9e9a8e26007bcd876e,6/a/6ab29b340f59830801750015d41e71b17fb6d8a2
+
+Q.idea/sonarlint/securityhotspotstore/9/0/909762385fc6eb20f922a91c6865741308b57f2c,e/0/e0ea4108d198a3d2e4e87c48063db9d2bffad652
+
+Q.idea/sonarlint/securityhotspotstore/b/0/b04578cffb47b1e57970601a0cacef6081245859,f/2/f235835ed945e2bdc599be5466a48e135a881845
+
+Q.idea/sonarlint/securityhotspotstore/b/b/bbf202272a96de5cd6b6828ffdc55fb3ce45289c,4/8/4863281891d32ef796d6f680d78cb100e7c940be
+w
+G.idea/sonarlint/issuestore/f/0/f0e0f9cec86fe4b939ae22be5264c758801eb28f,5/0/50e216b4439d2538168c3ddca9c0c2fe23bd1c02
+w
+G.idea/sonarlint/issuestore/f/f/ffaeea8ef322c1ce32b030cab72558052d2a67f1,8/d/8dfa1e436cb97f2fbe295faf4a0ef94e84de2229
\ No newline at end of file
diff --git a/.idea/sonarlint/securityhotspotstore/0/3/030ed2ccb712537825891dfda283154162e458a8 b/.idea/sonarlint/securityhotspotstore/0/3/030ed2ccb712537825891dfda283154162e458a8
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/1/0/10a03f31c4dce92cb371e761ce9429428bb6c176 b/.idea/sonarlint/securityhotspotstore/1/0/10a03f31c4dce92cb371e761ce9429428bb6c176
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/6/4/64876b8bea138a82803d0008198401e04ab468aa b/.idea/sonarlint/securityhotspotstore/6/4/64876b8bea138a82803d0008198401e04ab468aa
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/6/b/6bc361fab678f74f7da63b229ace2fc9d3130980 b/.idea/sonarlint/securityhotspotstore/6/b/6bc361fab678f74f7da63b229ace2fc9d3130980
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/7/0/7002b66a5a43fcbd6638cc9e9a8e26007bcd876e b/.idea/sonarlint/securityhotspotstore/7/0/7002b66a5a43fcbd6638cc9e9a8e26007bcd876e
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/8/8/88a9255124c95bdc913197c120a8d560edc59c8e b/.idea/sonarlint/securityhotspotstore/8/8/88a9255124c95bdc913197c120a8d560edc59c8e
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d b/.idea/sonarlint/securityhotspotstore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/9/0/909762385fc6eb20f922a91c6865741308b57f2c b/.idea/sonarlint/securityhotspotstore/9/0/909762385fc6eb20f922a91c6865741308b57f2c
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/9/6/961a371e72f8b2d2283f5377d41c5945b01f46ed b/.idea/sonarlint/securityhotspotstore/9/6/961a371e72f8b2d2283f5377d41c5945b01f46ed
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/9/f/9fe84ebb15faf917b7def6236dba604453cc61e0 b/.idea/sonarlint/securityhotspotstore/9/f/9fe84ebb15faf917b7def6236dba604453cc61e0
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/a/4/a413a8e92e5f60bcdd49831ce09ae50272942e7e b/.idea/sonarlint/securityhotspotstore/a/4/a413a8e92e5f60bcdd49831ce09ae50272942e7e
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/a/d/adba887bb96afb21dce969ef60ba276c068da22a b/.idea/sonarlint/securityhotspotstore/a/d/adba887bb96afb21dce969ef60ba276c068da22a
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/a/e/ae9ddf453f55affea2d6b9e3973cac1eb2efb4e1 b/.idea/sonarlint/securityhotspotstore/a/e/ae9ddf453f55affea2d6b9e3973cac1eb2efb4e1
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/b/0/b04578cffb47b1e57970601a0cacef6081245859 b/.idea/sonarlint/securityhotspotstore/b/0/b04578cffb47b1e57970601a0cacef6081245859
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/b/4/b4a0b63ce8560bbc5de0f9995c20cc861dc2adb3 b/.idea/sonarlint/securityhotspotstore/b/4/b4a0b63ce8560bbc5de0f9995c20cc861dc2adb3
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/b/b/bbf202272a96de5cd6b6828ffdc55fb3ce45289c b/.idea/sonarlint/securityhotspotstore/b/b/bbf202272a96de5cd6b6828ffdc55fb3ce45289c
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/d/a/da101d83b6b65667373de548a9f5004071396234 b/.idea/sonarlint/securityhotspotstore/d/a/da101d83b6b65667373de548a9f5004071396234
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/f/0/f0e0f9cec86fe4b939ae22be5264c758801eb28f b/.idea/sonarlint/securityhotspotstore/f/0/f0e0f9cec86fe4b939ae22be5264c758801eb28f
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/f/e/fe03b4fd3afe162c6e01309b98a22588e093d274 b/.idea/sonarlint/securityhotspotstore/f/e/fe03b4fd3afe162c6e01309b98a22588e093d274
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/f/f/ffaeea8ef322c1ce32b030cab72558052d2a67f1 b/.idea/sonarlint/securityhotspotstore/f/f/ffaeea8ef322c1ce32b030cab72558052d2a67f1
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb
new file mode 100644
index 0000000..877b0b8
--- /dev/null
+++ b/.idea/sonarlint/securityhotspotstore/index.pb
@@ -0,0 +1,62 @@
+
+S
+#.idea/sonarlint/issuestore/index.pb,9/f/9fe84ebb15faf917b7def6236dba604453cc61e0
+]
+-.idea/sonarlint/securityhotspotstore/index.pb,8/8/88a9255124c95bdc913197c120a8d560edc59c8e
+L
+git-branch-rebasing-task.iml,9/6/961a371e72f8b2d2283f5377d41c5945b01f46ed
+9
+ README.md,8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
+:
+
+.gitignore,a/5/a5cc2925ca8258af241be7e5b0381edf30266302
+A
+src/FeatureA.java,8/9/894d4e33067e340254905e7bf35220d38a4263e8
+w
+G.idea/sonarlint/issuestore/a/e/ae9ddf453f55affea2d6b9e3973cac1eb2efb4e1,6/2/6248197ca7a44d8bc42b5bd6cd80cd6e99143261
+
+Q.idea/sonarlint/securityhotspotstore/0/3/030ed2ccb712537825891dfda283154162e458a8,c/9/c9b3776f6ce02f40809b5a2883142fcb439b1357
+
+Q.idea/sonarlint/securityhotspotstore/d/a/da101d83b6b65667373de548a9f5004071396234,4/9/498db7fa72e22981104129d8b731ec77e0d45c35
+
+Q.idea/sonarlint/securityhotspotstore/6/4/64876b8bea138a82803d0008198401e04ab468aa,a/5/a5fd33cdefef73f893557e24a010c7f884013f96
+
+Q.idea/sonarlint/securityhotspotstore/6/b/6bc361fab678f74f7da63b229ace2fc9d3130980,b/8/b865a30afc0ea49246217e641d4693db7d27c76a
+
+Q.idea/sonarlint/securityhotspotstore/7/0/7002b66a5a43fcbd6638cc9e9a8e26007bcd876e,4/6/463af4e1f5421c687c9cd8f970d12aa4b7254c54
+
+Q.idea/sonarlint/securityhotspotstore/a/e/ae9ddf453f55affea2d6b9e3973cac1eb2efb4e1,e/3/e36d3b35b0aa033dfcf067b2cd16117a306b1e80
+
+Q.idea/sonarlint/securityhotspotstore/f/0/f0e0f9cec86fe4b939ae22be5264c758801eb28f,f/c/fc51aad2f1ebe72ffedf49fa3dfea24b513ff6fe
+
+Q.idea/sonarlint/securityhotspotstore/f/f/ffaeea8ef322c1ce32b030cab72558052d2a67f1,f/3/f35b2740cd738d7308d96a63c804bf41f1389ec6
+w
+G.idea/sonarlint/issuestore/9/0/909762385fc6eb20f922a91c6865741308b57f2c,c/e/ce7799643a95553c6bee1d403d6cb738907a7f2c
+
+Q.idea/sonarlint/securityhotspotstore/9/6/961a371e72f8b2d2283f5377d41c5945b01f46ed,5/c/5c797c4c838cf559f2351fbcbd257ff369dcebe8
+w
+G.idea/sonarlint/issuestore/9/6/961a371e72f8b2d2283f5377d41c5945b01f46ed,3/1/317eebb71e91d4aa7c9073faee2c4d6399e8bac3
+w
+G.idea/sonarlint/issuestore/b/0/b04578cffb47b1e57970601a0cacef6081245859,7/2/72d60672c1f4ee9fd0ef10acd6189a6dce5f9e9f
+w
+G.idea/sonarlint/issuestore/b/b/bbf202272a96de5cd6b6828ffdc55fb3ce45289c,8/4/84e95bd0ea795e5307464eb72e7bd95d9f673c00
+w
+G.idea/sonarlint/issuestore/0/3/030ed2ccb712537825891dfda283154162e458a8,0/c/0c3c05c2b18505590a392e5404b4d055f24cf3dd
+w
+G.idea/sonarlint/issuestore/d/a/da101d83b6b65667373de548a9f5004071396234,5/0/507f2c20d93b4e99b2aac0dbb66ba73cc2b9414f
+w
+G.idea/sonarlint/issuestore/6/4/64876b8bea138a82803d0008198401e04ab468aa,d/3/d34c834095f0696feda374867b7919b9fc479801
+w
+G.idea/sonarlint/issuestore/6/b/6bc361fab678f74f7da63b229ace2fc9d3130980,2/e/2eff36c1f7e804d5ff3d50f9f26d58da27834004
+w
+G.idea/sonarlint/issuestore/7/0/7002b66a5a43fcbd6638cc9e9a8e26007bcd876e,6/a/6ab29b340f59830801750015d41e71b17fb6d8a2
+
+Q.idea/sonarlint/securityhotspotstore/9/0/909762385fc6eb20f922a91c6865741308b57f2c,e/0/e0ea4108d198a3d2e4e87c48063db9d2bffad652
+
+Q.idea/sonarlint/securityhotspotstore/b/0/b04578cffb47b1e57970601a0cacef6081245859,f/2/f235835ed945e2bdc599be5466a48e135a881845
+
+Q.idea/sonarlint/securityhotspotstore/b/b/bbf202272a96de5cd6b6828ffdc55fb3ce45289c,4/8/4863281891d32ef796d6f680d78cb100e7c940be
+w
+G.idea/sonarlint/issuestore/f/0/f0e0f9cec86fe4b939ae22be5264c758801eb28f,5/0/50e216b4439d2538168c3ddca9c0c2fe23bd1c02
+w
+G.idea/sonarlint/issuestore/f/f/ffaeea8ef322c1ce32b030cab72558052d2a67f1,8/d/8dfa1e436cb97f2fbe295faf4a0ef94e84de2229
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8fa5c67
--- /dev/null
+++ b/README.md
@@ -0,0 +1,29 @@
+# Git Branches and Rebasing Task
+
+Zweier Gruppen (Person A & Person B)
+Einer forked das Repository mit allen branches und lädt den anderen als Contributer ein.
+Macht die Aufgabe gemeinsam, Schritt für Schritt.
+
+1. Person A wechselt auf Branch ```featureA```
+2. Person B wechselt auf den Branch ```featureB```
+3. Person A fügt in der Java Klasse ```FeatureA.java``` in der Ausgabe seinen Namen hinzu.
+4. Person B fügt in der Java Klasse ```FeatureB.java``` in der Ausgabe seinen Namen hinzu.
+5. Person A/B machen jeweils einen Commit für ihre Änderungen und pushen diese.
+6. Person A :
+ 1. Schaut euch die git commit History an (Log)
+ 1. Vergleicht die commits von seinem eigenen Branch und dem main branch
+ 1. Merged den main "into" euren Branch
+ 1. Vergleicht erneut die commits von seinem eigenen Branch und dem main branch
+ 1. Pusht den gemergeten branch
+ 1. Stelle über github einen PullRequest und merged diesen.
+
+
+7. Person B :
+ 1. Update dein Projekt
+ 1. Vergleicht die commits von seinem eigenen Branch und dem main branch
+ 1. Merged den main "into" euren Branch
+ 1. Ihr solltet jetzt eine "Merge Conflict bekommen", löst ihn mit hilfe von IntelliJ.
+ 1. Vergleicht erneut die commits von seinem eigenen Branch und dem main branch
+ 1. Pusht den gemergeten branch
+ 1. Stelle über github einen PullRequest und merged diesen.
+
diff --git a/git-branch-rebasing-task.iml b/git-branch-rebasing-task.iml
index 004be91..f3e1ace 100644
--- a/git-branch-rebasing-task.iml
+++ b/git-branch-rebasing-task.iml
@@ -8,4 +8,7 @@
+
+
+
\ No newline at end of file
diff --git a/src/FeatureA.java b/src/FeatureA.java
index 8b73584..8213fa2 100644
--- a/src/FeatureA.java
+++ b/src/FeatureA.java
@@ -1,8 +1,14 @@
-
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
public class FeatureA{
public static void main(String[] args) {
System.out.println("Hallo, das ist der Code von ");
+ List nameSpelling = new ArrayList<>();
+ String name = "Jakob Schneider";
+ nameSpelling = Arrays.stream(name.split("")).toList();
+ nameSpelling.stream().forEach(System.out::println);
}
}