Updated css
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	about.html
	image/background/background_1.jpg
	image/background/background_2.jpg
	index.html
	news.html
	strats.html
	style.css