Fixed problems in main.css

Merge branch 'master' of https://github.com/leyarotheconquerer/Magnacanos---.git

Conflicts:
	style/main.css
Fixed colors! Yay!
Fixed WEIRD conflicts and changes to main.css

Merge branch 'master' of https://github.com/leyarotheconquerer/Magnacanos---.git

Conflicts:
	style/main.css