fix assignment page for retina displays
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css
fix remove
move hyper link
Merge branch 'master' into chats