Merge remote-tracking branch 'remotes/origin/master' into daniil
HTML maaan
Merge remote-tracking branch 'remotes/origin/master' into daniil

Conflicts:
	src/main/webapp/WEB-INF/jsp/bugs.jsp
	src/main/webapp/index.jsp
Merge remote-tracking branch 'remotes/origin/master' into daniil

Conflicts:
	src/main/webapp/WEB-INF/jsp/bugs.jsp
	src/main/webapp/index.jsp
Merge remote-tracking branch 'remotes/origin/master' into daniil

Conflicts:
	src/main/webapp/WEB-INF/jsp/bugs.jsp
	src/main/webapp/index.jsp
test
Merge remote-tracking branch 'remotes/origin/master' into daniil

Conflicts:
	src/main/webapp/WEB-INF/jsp/bugs.jsp
	src/main/webapp/index.jsp
Merge remote-tracking branch 'remotes/origin/master' into daniil

Conflicts:
	src/main/webapp/WEB-INF/jsp/bugs.jsp
	src/main/webapp/index.jsp
Merge branch 'danyaglebtestbranch' into daniil

Conflicts:
	src/main/webapp/WEB-INF/jsp/navigation.jsp
	src/main/webapp/WEB-INF/jsp/projects.jsp
	src/main/webapp/index.jsp
Merge branch 'danyaglebtestbranch' into daniil

Conflicts:
	src/main/webapp/WEB-INF/jsp/navigation.jsp
	src/main/webapp/WEB-INF/jsp/projects.jsp
	src/main/webapp/index.jsp
Merge remote-tracking branch 'remotes/origin/master' into daniil

Conflicts:
	src/main/java/ru/hse/esadykov/controller/BugController.java
	src/main/webapp/WEB-INF/jsp/bug.jsp
	src/main/webapp/WEB-INF/jsp/bugs.jsp
	src/main/webapp/WEB-INF/jsp/projects.jsp
Merge branch 'daniil'
Merge remote-tracking branch 'remotes/origin/master' into daniil

Conflicts:
	src/main/java/ru/hse/esadykov/controller/BugController.java
	src/main/webapp/WEB-INF/jsp/bug.jsp
	src/main/webapp/WEB-INF/jsp/bugs.jsp
	src/main/webapp/WEB-INF/jsp/projects.jsp