using jsf
moved to tomcat
1
delete all
Merge branch 'master' of https://github.com/maratUfa/webapp.git

Conflicts:
	pom.xml
	src/main/java/controllers/MainController.java
	src/main/resources/templates/index.html
	webapp.iml
1
Merge branch 'master' of https://github.com/maratUfa/webapp.git

Conflicts:
	web/WEB-INF/dispatcher-servlet.xml
	web/WEB-INF/pages/index.jsp
	web/resources/js/app.js
	webapp.iml
removed iml file