logging
log

Conflicts:
	static/js/controllers.js