Made suggested changes.

Added a dropbox to the student items.
Fixed CSS where needed.
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/css/styles.css