Capitalize W
Capitalize M
Merge branch 'tmp'
add come
add please
Merge branch 'edit_text'

Conflicts:
	index.html