Did major overhaul of CSS and website layout
Fixed a bad exception instantiation
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/server.py