lots more styling
Merge branch 'master' of github.com:derekrazo/aisle-pilot

Conflicts:
	server/main.js