Homework exercise 2
Merge branch 'master' of https://github.com/haimGeorge/javastockrepo

Conflicts:
	src/com/mta/javacourse/Algo_trade_mac08Servlet.java
	war/WEB-INF/appengine-web.xml