ignore
Merge branch 'master' of github.com:drmelectronic/palabrayespiritu

Conflicts:
	kids/views.py
ignore