day5
git ignore
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	day5/Persistance-API/App1/.idea/workspace.xml
	day5/Persistance-API/App1/ModelJPA/src/ru/intf/model/Report.java
	day5/Persistance-API/App1/out/artifacts/App1/App1.ear
	day5/Persistance-API/App1/out/artifacts/App1_ear_exploded/Model.jar
	day5/Persistance-API/App1/out/artifacts/App1_ear_exploded/View.war
	day5/Persistance-API/App1/out/artifacts/App1_ear_exploded/lib/ModelClient.jar
	day5/Persistance-API/App1/out/artifacts/App1_ear_exploded/lib/ModelJPA.jar
	day5/Persistance-API/App1/out/artifacts/Model/Model.jar
	day5/Persistance-API/App1/out/artifacts/ModelClient/ModelClient.jar
	day5/Persistance-API/App1/out/artifacts/ModelJPA/ModelJPA.jar
	day5/Persistance-API/App1/out/artifacts/Model_ejb_exploded/ru/intf/model/Facade.class
	day5/Persistance-API/App1/out/artifacts/View/View.war
	day5/Persistance-API/App1/out/production/Model/ru/intf/model/Facade.class
	day5/Persistance-API/App1/out/production/ModelJPA/ru/intf/model/Report.class
work