Eugene Simakin Merge remote-tracking branch 'origin/gh-pages' into gh-pages
d2014a7 Mar 16, 2014
Merge remote-tracking branch 'origin/gh-pages' into gh-pages 
Conflicts:
	js/main.js
d2014a7