made some changes
made some tiny changes
Merge branch 'master' of https://github.com/gestone/WaterFountain