Merge branch 'master' of https://github.com/WLey86129/kindergarten

Conflicts:
	.idea/workspace.xml
add

add