google+
google+
Merge branch 'master' of https://github.com/SvenWinkler/ThatsMyKid

Conflicts:
	client/ThatsMyKid.html
Merge branch 'master' of https://github.com/SvenWinkler/ThatsMyKid

Conflicts:
	client/ThatsMyKid.html
Merge branch 'master' of https://github.com/SvenWinkler/ThatsMyKid

Conflicts:
	client/ThatsMyKid.html