adds basic styling fixed some js dependencies
Merge

Conflicts:
	server.js