drobne pierdoly
Merge branch 'master' of https://github.com/mxwlodar/spop

Conflicts:
	spop.cabal
	src/Dao.hs