More cleaning up
Merge branch 'master' of https://github.com/MrBean355/KinderFinder
Reorganised