add ui update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Lab1/js/logic.js