Merge branch 'master' of github.com:welikepie/simcity-status

Conflicts:
	style.css