Lots of stuff.
Server functionality
Merge branch 'seth' into master2

Conflicts:
	app/views/tables/assignment.html.erb
tweeks
tweeks
server styling