index controller
teest asdasd
Merge branch 'master' of https://github.com/ruzovvo/Laundry

Conflicts:

target/m2e-wtp/web-resources/META-INF/maven/Laundry/Laundry/pom.properti
es
	target/m2e-wtp/web-resources/META-INF/maven/Laundry/Laundry/pom.xml