moidified
Merge branch 'master' of https://github.com/richard28530/Mystuff