Merge branch 'yuval&barel'

Conflicts:
BlackJack_Iteration2/build/built-jar.properties

BlackJack_Iteration2/build/classes/blackjack_iteration2/BlackJack_Help.h
tml
BlackJack_Iteration2/build/classes/blackjack_iteration2/Dealer.class
BlackJack_Iteration2/build/classes/blackjack_iteration2/Game.class

BlackJack_Iteration2/build/classes/blackjack_iteration2/HelpWindow$1.cla
ss

BlackJack_Iteration2/build/classes/blackjack_iteration2/HelpWindow.class
BlackJack_Iteration2/build/classes/blackjack_iteration2/Human.class

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$1.cla
ss

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$10.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$11.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$12.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$13.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$14.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$15.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$16.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$17.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$18.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$19.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$2.cla
ss

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$20.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$21.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$22.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$23.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$24.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$25.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$26.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$27.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$28.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$29.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$3.cla
ss

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$30.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$31.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$32.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$33.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$34.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$35.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$36.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$37.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$38.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$39.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$4.cla
ss

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$40.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$41.cl
ass

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$5.cla
ss

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$6.cla
ss

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$7.cla
ss

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$8.cla
ss

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow$9.cla
ss

BlackJack_Iteration2/build/classes/blackjack_iteration2/MainWindow.class
BlackJack_Iteration2/build/classes/desktop.ini
BlackJack_Iteration2/src/blackjack_iteration2/BlackJack_Help.html
BlackJack_Iteration2/src/blackjack_iteration2/Dealer.java
BlackJack_Iteration2/src/blackjack_iteration2/Game.java
BlackJack_Iteration2/src/blackjack_iteration2/HelpWindow.java
BlackJack_Iteration2/src/blackjack_iteration2/Human.java
BlackJack_Iteration2/src/blackjack_iteration2/MainWindow.java
BlackJack_Iteration2/src/blackjack_iteration2/Player.java
BlackJack_Iteration2/src/desktop.ini
README.md