Latest CSS changes.

I am jeebus.
Updated Nginx
Merge branch 'master' of https://github.com/mjpuser/nsite

Conflicts:
	config/nginx.conf
Updated Nginx File