first commit
first commit
Merge branch 'master' of https://github.com/haimGeorge/javastockrepo

Conflicts:
	README.md
my first eclipse commit
my second commit
my third commit
my forth commit
commit 1
Merge branch 'master' of https://github.com/haimGeorge/javastockrepo.git

Conflicts:
	.project
	war/WEB-INF/appengine-web.xml
	war/WEB-INF/web.xml
	war/index.html