all in one
Merge remote-tracking branch 'origin/master'
all in one
all in one
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
all in one