edit html
Merge commit 'dad3b9e33a630478d57854ecdcfd4062d18fa299' into ryokajiwara_master

Conflicts:
	StackUnderflow/db/schema.rb