2 files changed, 7 insertions, 2 deletions
diff --git a/README.md b/README.md
index 6416b47..5db98bf 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # UCLA_MAE_154B
 UCLA Spring 2019, MAE 154B
 
-Code enables the creation of NACA airfoils;
-the evaluation of the airfoil's structural properties;
+This program enables the creation of NACA airfoils;\
+the evaluation of the airfoil's structural properties;\
 the optimization via genetic algorithm of a population of airfoils, using standard GA algorithms.
diff --git a/__init__.py b/__init__.py
index 274be56..1521839 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,7 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 __author__ = "Marius Peter"
+<<<<<<< HEAD
 __version__ = "2.1"
 __revision__ = "2.1.1"
 
 qwqw
+=======
+__version__ = "2.3"
+__revision__ = "2.3.1"
+>>>>>>> 4f2f9b29b0863fa670cd889f20f3c5ba76a1b80b