test comm
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	.gitignore
	__pycache__/server.cpython-34.pyc
	post/index.jade
	post/services.jade