hmm2
Pozadki ehhh

zjebalo sie cos
papap
ign
.
conf1
k
Merge branch 'master' of https://github.com/arfixer/setupo_cms

Conflicts:
	nbproject/private/private.xml