Update compiled assets
Merge conflict caused by fixing the same thing twice

Conflicts:
	assets/css/main.css