closed #6
#6 changed structure of footer
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	out/artifacts/web_war_exploded/header.jsp
	out/artifacts/web_war_exploded/index.jsp
	out/artifacts/web_war_exploded/login.jsp
	web/web/header.jsp
	web/web/index.jsp
	web/web/login.jsp
	web/web/style/style.css