updates
updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	delo/css/style.css
	delo/js/main.js
updates