sht+enter to submit /post-line
Merge commit 'fd4e13c59149f00cc8d1f81550f40cd1011ee6db'

Conflicts:
	js/function.js

use enter post
master commit