ничего
second page
Merge branch 'master' of https://github.com/temkin/seemax_markup

Conflicts:
	index.html
	public/css/desktop.css
	public/css/lib/default.css
	public/i/blr.png
	public/i/img/ban.jpg
	public/js/lib/jquery-1.8.3.min.js
	public/js/lib/jquery/jquery.jscrollpane.js
	public/js/lib/jquery/jquery.lightbox.js
	public/js/lib/jquery/jquery.swfobject.js
	public/js/main.js