lenhome
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log

	.metadata/.plugins/org.eclipse.core.resources/.projects/Bauman/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Bauman/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Boobs/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Boobs/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Car/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Car/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/ComparablePerson/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/ComparablePerson/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Dick/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Dick/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Enums/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Enums/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Exceptions/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Exceptions/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/First/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/First/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/FirstJspServletJsp/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/FirstJspServletJsp/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/FirstJspServletJsp/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/FirstJspServletJsp/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Fish/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Fish/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/GUI/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/GUI/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/GUI_1/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/GUI_1/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Generics/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Generics/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab11/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab11/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab11_1_do_while_GAME/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab11_1_do_while_GAME/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab12/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab12/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab14.1_arrays2/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab14.1_arrays2/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab14_Arrays/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab14_Arrays/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab16/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab16/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab18/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab18/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab19/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab19/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab25/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab25/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab4.1_if/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab4.1_if/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab4/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab4/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab5/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab5/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab6_Sqrt/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab6_Sqrt/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab7/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab7/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab8/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab8/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab9/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab9/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab9_1_table_math/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Lab9_1_table_math/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstProject/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/MyFirstProject/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/MyTests(polymorphism)/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/MyTests(polymorphism)/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT10.1/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT10.1/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT10/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT10/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT11/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT11/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT3/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT3/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT4/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT4/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT5/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT5/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT6/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT6/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT7/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT7/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT8/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT8/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT9/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/PVT9/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Pvt1/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Pvt1/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Pvt2/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Pvt2/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Relationships/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Relationships/.syncinfo.snap

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet7_add_DAO/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet7_add_DAO/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet7_sql/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet7_sql/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet8_JSP/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet8_JSP/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_3_4/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_3_4/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_5_add_include_forward/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_5_add_include_forward/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_5_graph/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_5_graph/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_6_cookie/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/Servlet_6_cookie/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/engine/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/engine/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/jsp500/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/jsp500/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/news2/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/news2/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2308951505.index
	.metadata/.plugins/org.eclipse.jdt.core/3149084191.index
	.metadata/.plugins/org.eclipse.jdt.core/3355987419.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jst.jsp.core/taglibindex/3149084191.dat
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml

	.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.wst.jsdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties