Update: 01-08-2014 18:05
Merge branch 'master' of https://github.com/CatfishStudio/BlogCatfish

Conflicts:
	version 2/somov.inf.ua/flash.html