main
Merge branch 'master' of https://github.com/sarradana/Delda

Conflicts:
	main.css
ridemane shomare 2