Merge branch 'master' of C:\Users\THOMAS\IdeaProjects\websiteWoW with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	webGuild/index.html
navbar