commit branch
change line
Merge branch 'dev_malcky'

Conflicts:
	index.html
start production branch
Merge branch 'production'
123
Merge branch 'production'
master update
1
add index gain
change on prod branch
master change
Merge branch 'master' into dev_malcky

Conflicts:
	index.html