lagað til
Merge branch 'master' of https://github.com/kristrun12/Project-VIFG

Conflicts:
	areachart.css
	areachart.html
lagaði eh villur i css