main css
Merge branch 'master' of https://github.com/LegendaryAks/CCMR

Conflicts:
	css/main.css