eh
yoloMerge branch 'master' of https://github.com/kristrun12/Project-VIFG

Conflicts:
	areachart.html
yolofun