styles
Merge branch 'master' of https://github.com/askaza/fortuna-code

Conflicts:
	css/components.css
Merge branch 'master' of https://github.com/askaza/fortuna-code
styles