merge logo
changes: staff
Merge remote-tracking branch 'origin/noBugs' into master_steka

Conflicts:
	public/stylesheets/naukanu_style.css
Added Youtube Video for resolving conflicts
Merge pull request #10 from mean2k/master_steka

Master steka