added CNAME for master branch
Otcov darcek na vianoce 2014
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	CNAME