Edited queue.html, app.js, index.html, queue.js
queue.js
"queue"
Merge origin/master

Conflicts:
	app/scripts/app.js