average view
Merge branch 'master' into branch_jens
Merge branch 'master' into branch_jens
in between commit
Merge branch 'master' into branch_jens
modifications in html and css
Merge pull request #17 from HackerPartie/branch_jens

Branch jens