Resolved merge
Changed color codes in table using glyph
Merge branch 'master' of https://github.com/JohanEks/testrepo

Conflicts:
	Elvisualisering/index.html
Merge remote-tracking branch 'origin/master' into layout