Coommit Julie
Merge branch 'branch_julie'

* branch_julie:
  Coommit Julie

Conflicts:
	index.html
Merge branch 'branch_flaver'

* branch_flaver:
  Test2

Conflicts:
	index.html
commit fram julie 2
Merge branch 'branch_julie'

* branch_julie:
  commit fram julie 2

Conflicts:
	index.html
Fix
Merge branch 'branch_flaver'

* branch_flaver:
  What ever

Conflicts:
	index.html
Revert "Merge branch 'branch_flaver'"

This reverts commit 5021dbc6bb9de3a03bcc068a556cf2ada6b56c78, reversing
changes made to 2925c4af2a12d6b655ced9a244580a8c9df8a011.