eco feedback per person
Merge remote-tracking branch 'origin/master' into Eco-feedback
eco feedback per person cont.
Merge branch 'master' of https://github.com/JohanEks/testrepo

Conflicts:
	Elvisualisering/index.html
Merge remote-tracking branch 'origin/player'