style
Merge branch 'master' of https://github.com/elgame/yuppics2.1

Conflicts:
	application/css/skin/yuppics/style.css