Ascetica
Merge branch 'master' of https://github.com/TomiToivio/Lapsiteema

Conflicts:
	README.md