Merge branch 'master' of https://github.com/Blendoit/UCLA_MAE_154B

Commit
715b605b51cdc1fd1257e700394101fda0aafd55
Author
Marius Peter <blendoit@gmail.com>
Author date
Committer
Marius Peter <blendoit@gmail.com>
Committer date
Changed files
README.md
index 6416b47e..5db98bff 100644..100644
@@ -1,6 +1,6 @@
1 1 # UCLA_MAE_154B
2 2 UCLA Spring 2019, MAE 154B
3 3
4 Removed: Code enables the creation of NACA airfoils;
5 Removed: the evaluation of the airfoil's structural properties;
4 Added: This program enables the creation of NACA airfoils;\
5 Added: the evaluation of the airfoil's structural properties;\
6 6 the optimization via genetic algorithm of a population of airfoils, using standard GA algorithms.
__init__.py
index 274be564..15218393 100644..100644
@@ -13,7 +13,12 @@
13 13 # You should have received a copy of the GNU General Public License
14 14 # along with this program. If not, see <https://www.gnu.org/licenses/>.
15 15 __author__ = "Marius Peter"
16 Added: <<<<<<< HEAD
16 17 __version__ = "2.1"
17 18 __revision__ = "2.1.1"
18 19
19 20 qwqw
21 Added: =======
22 Added: __version__ = "2.3"
23 Added: __revision__ = "2.3.1"
24 Added: >>>>>>> 4f2f9b29b0863fa670cd889f20f3c5ba76a1b80b