Little commit

Conflicts:

	jia/jia/compute.py
	jia/jia/static/js/board.js
	jia/jia/views.py