Added loop descriptor
Added loop descriptor
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/javascripts/app.js
Added loop descriptor