ended resume
push
xampp using(site*.loc)
site*.loc
Merge branch 'master' of https://github.com/teadrinker1995/khai

Conflicts:
	LavorchukVI/Java/.metadata/.plugins/org.eclipse.core.resources/.projects/PrW3/org.eclipse.jdt.core/state.dat
	LavorchukVI/Java/.metadata/.plugins/org.eclipse.core.resources/.projects/PrW4/org.eclipse.jdt.core/state.dat
	LavorchukVI/Java/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	LavorchukVI/Java/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	LavorchukVI/Java/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	LavorchukVI/Java/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	LavorchukVI/Java/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	LavorchukVI/Java/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	LavorchukVI/Java/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml