Joined css files into 1 and set minified files.
Merge branch 'master' of https://github.com/Ocirina/CRIA

Conflicts:
	client/index.html