test commit
added gallery
test
test
Merge branch 'master' of github.com:SergeySukhanov/dag

Conflicts:
	resources/css/content.css