Added timing logs and cleaned out unused stuff
Merge remote-tracking branch 'origin/master' into player
Merge remote-tracking branch 'origin/master' into player
Merge remote-tracking branch 'origin/master' into gh-pages
removed last point in data.js
Merge branch 'master' of https://github.com/JohanEks/testrepo
Fixed button sizes to prevent overflow
Merge branch 'gh-pages' of https://github.com/JohanEks/testrepo into gh-pages
Changed layout of environment
Changed i-texts, increased size of i's
Merge remote-tracking branch 'origin/master' into gh-pages
Fixed bugg with body onClick
eco feedback per person
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into Eco-feedback
playerDelay=20s and cleaned up player code
eco feedback per person cont.
Merge remote-tracking branch 'origin/master' into gh-pages
Merge branch 'gh-pages' of https://github.com/JohanEks/testrepo into gh-pages
resolved conflict