Merge branch 'master' of https://github.com/aletheia/kidstuff
Merge branch 'develop'
still white space, cleaner code
stuff 03
Merge branch 'hotfix/whiteSpacing' into develop