Merge Conflict

.metadata/.log

.metadata/.plugins/org.eclipse.cdt.core/.log

...ore.resources/.history/1/a0d3c805c3c900131ff7d2a9e9b5aec6

...re.resources/.history/11/d0209a2bbdc900131ff7d2a9e9b5aec6

...re.resources/.history/16/40d91a3e68c7001316e2eb0225b97719

...ore.resources/.history/2/f02bfa1ac5c900131ff7d2a9e9b5aec6

...re.resources/.history/21/80913265c5c900131ff7d2a9e9b5aec6

...re.resources/.history/26/502cda1668c7001316e2eb0225b97719

...re.resources/.history/29/000815dcbbc900131ff7d2a9e9b5aec6

...re.resources/.history/29/201b7e99bcc900131ff7d2a9e9b5aec6

...re.resources/.history/2c/40e63543bbc900131ff7d2a9e9b5aec6

...re.resources/.history/35/e032dbabc0c900131ff7d2a9e9b5aec6

...re.resources/.history/40/d0c9a2efbac900131ff7d2a9e9b5aec6

...re.resources/.history/42/d0924360bdc900131ff7d2a9e9b5aec6

...re.resources/.history/4e/60b28036bec900131ff7d2a9e9b5aec6

...re.resources/.history/4f/101e596d68c7001316e2eb0225b97719

...re.resources/.history/51/00d1f91dbdc900131ff7d2a9e9b5aec6

...re.resources/.history/5a/b05276e8bcc900131ff7d2a9e9b5aec6

...re.resources/.history/5c/c0cf983ec1c900131ff7d2a9e9b5aec6

...re.resources/.history/5d/20958c33bdc900131ff7d2a9e9b5aec6