track ordering preserved
Merge branch 'master' of https://github.com/deannazhu514/15237-AND

Conflicts:
	app.js
	static/js/client_socket.js
	static/js/sc.js
fixed merge