update third right UI
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	osslab/src/app/templates/third.html
ui for hackathon
Merge pull request #26 from czx0619/dev

update third right UI