some ui stuff

merge conflicts here we come!
Merge remote-tracking branch 'origin/master'

Conflicts:
	assign2.py