Squashed commit of the following:

commit 1509cc966ff1a55ad4fef34dbbbc821bda9df1f5
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:20:12 2012 +0300

    ..

commit 1a9923b4b01196345ba05bfafe8cdf710af0f9a2
Merge: d4b47da a7d8432
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:10:12 2012 +0300

    Merge remote-tracking branch 'origin/gh-pages'

commit d4b47da6f56d552492ef4bc3ed6a61734b70fa34
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 09:45:50 2012 +0300

    ..

commit 43e90ebe2e89d1b85f6a42f05661aff04d1885f0
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 09:44:06 2012 +0300

    ..

commit 0058b4c44314818300ab40730a9febe20311b4a6
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 09:31:06 2012 +0300

    first commit
Conflicts:
	index.html
	komestra/img-dev/kom-index-2-b-layout.css
Squashed commit of the following:

commit 17c663d7ec290bb55a52e749fb145ea853a05f8e
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:30:18 2012 +0300

    ..

commit ee23f5bb59bb6fb743eb9f6d3afb0fed444cfe8a
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:28:40 2012 +0300

    ..

commit 1509cc966ff1a55ad4fef34dbbbc821bda9df1f5
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:20:12 2012 +0300

    ..

commit 1a9923b4b01196345ba05bfafe8cdf710af0f9a2
Merge: d4b47da a7d8432
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:10:12 2012 +0300

    Merge remote-tracking branch 'origin/gh-pages'

commit d4b47da6f56d552492ef4bc3ed6a61734b70fa34
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 09:45:50 2012 +0300

    ..

commit 43e90ebe2e89d1b85f6a42f05661aff04d1885f0
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 09:44:06 2012 +0300

    ..

commit 0058b4c44314818300ab40730a9febe20311b4a6
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 09:31:06 2012 +0300

    first commit
Conflicts:
	komestra/css/blocks.css
	komestra/img-dev/kom-index-2-b-layout.css
	komestra/img/buttons-sprite.png
	komestra/index-3-layout.html
Squashed commit of the following:

commit a3dc40b0e62afd51a14e401771683ebff21970bb
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 13:03:18 2012 +0300

    active page selected

commit 77e622b3d70615e7acba3e13de976ac8d9ca3480
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 13:02:43 2012 +0300

    nav-rubrics

commit 06efb19a216bc1429b2a364e0a112a24200e5900
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 11:41:24 2012 +0300

    ..

commit 17c663d7ec290bb55a52e749fb145ea853a05f8e
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:30:18 2012 +0300

    ..

commit ee23f5bb59bb6fb743eb9f6d3afb0fed444cfe8a
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:28:40 2012 +0300

    ..

commit 1509cc966ff1a55ad4fef34dbbbc821bda9df1f5
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:20:12 2012 +0300

    ..

commit 1a9923b4b01196345ba05bfafe8cdf710af0f9a2
Merge: d4b47da a7d8432
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:10:12 2012 +0300

    Merge remote-tracking branch 'origin/gh-pages'

commit d4b47da6f56d552492ef4bc3ed6a61734b70fa34
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 09:45:50 2012 +0300

    ..

commit 43e90ebe2e89d1b85f6a42f05661aff04d1885f0
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 09:44:06 2012 +0300

    ..

commit 0058b4c44314818300ab40730a9febe20311b4a6
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 09:31:06 2012 +0300

    first commit
Conflicts:
	komestra/css/blocks.css
Squashed commit of the following:

commit 5dc0531163faf519bb98ad7c3fc1b19828b136e2
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 13:07:27 2012 +0300

    bold bug

commit a3dc40b0e62afd51a14e401771683ebff21970bb
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 13:03:18 2012 +0300

    active page selected

commit 77e622b3d70615e7acba3e13de976ac8d9ca3480
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 13:02:43 2012 +0300

    nav-rubrics

commit 06efb19a216bc1429b2a364e0a112a24200e5900
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 11:41:24 2012 +0300

    ..

commit 17c663d7ec290bb55a52e749fb145ea853a05f8e
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:30:18 2012 +0300

    ..

commit ee23f5bb59bb6fb743eb9f6d3afb0fed444cfe8a
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:28:40 2012 +0300

    ..

commit 1509cc966ff1a55ad4fef34dbbbc821bda9df1f5
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:20:12 2012 +0300

    ..

commit 1a9923b4b01196345ba05bfafe8cdf710af0f9a2
Merge: d4b47da a7d8432
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 10:10:12 2012 +0300

    Merge remote-tracking branch 'origin/gh-pages'

commit d4b47da6f56d552492ef4bc3ed6a61734b70fa34
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 09:45:50 2012 +0300

    ..

commit 43e90ebe2e89d1b85f6a42f05661aff04d1885f0
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 09:44:06 2012 +0300

    ..

commit 0058b4c44314818300ab40730a9febe20311b4a6
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 09:31:06 2012 +0300

    first commit
Merge branch 'master' into gh-pages

Conflicts:
	komestra/css/blocks.css
Squashed commit of the following:

commit 3fdfa7a8921d7169ea9c150aa3ad56578f8752f8
Author: Viacheslav Poturaev <nanopeni@gmail.com>
Date:   Mon Jul 23 13:14:59 2012 +0300

    nav-rubrics fade
..
..
removing input placeholder text on click
teared backgrounds bug
index-3-b
index-3-b
Merge remote-tracking branch 'origin/gh-pages'