Merge branch 'master' of https://github.com/pmilla1606/wifg20

Conflicts:
	index.html
	style.css
warbgl
WAT