D
D
Dd'
Merge branch 'master' of github.com:ekkodill/jalla

Conflicts:
	css/Design.css
	css/minside.css
	minside.php