ok
test
Merge pull request #8 from ycj28c/master

new submit
Merge pull request #10 from ycj28c/master

change the properties file
Merge pull request #12 from ycj28c/master

add factory design model, add company back end dao, add junit test
code

jhgjhvgjhb
Merge branch 'master' of https://github.com/tedqiao/cs542

Conflicts:
	.classpath
Merge pull request #5 from tedqiao/master

pul