django scaffolding
Merge branch 'master' of https://github.com/estark37/calgame

Conflicts:
	src/util/async.js
	src/util/jquery.min.js
	static/js/async.js
	static/js/jquery.min.js
	util/async.js
	util/jquery.min.js