Merge branch 'main' of https://github.com/OleksiyPenkov/X-RayCalc2

# Conflicts:
#	README.md

README.md

@@ -1,2 +1,12 @@
+<<<<<<< HEAD
 # X-RayCalc2
+=======
+# X-RayCalc 2
+
+X-Ray Calc 2 is a revised and improved version of software for computer simulation of X-ray reflectivity, including normal incidence and grazing incidence X-ray reflectometry (NIXR and GIXR). Find more information about the previous version here https://linkinghub.elsevier.com/retrieve/pii/S2352711019303681
+
+In this version, the automatic optimization based on modified LFPSO algorithm was implemented (see https://ieeexplore.ieee.org/document/10066334/ for further details).
+
+The X-Ray Calc distribution contents several demonstration projects located in the Examples folder To see the demos, click the Open button, navigate to the Examples folder, and select a project file.
+>>>>>>> 7a9d1caf59ea449b20f98ef32256a094cfcd092c