rename and ignore
Merge branch 'master' of https://github.com/gestone/WaterFountain

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/gestone/WaterFountain

Conflicts:
	.idea/workspace.xml
photouploading
Merge branch 'master' of https://github.com/gestone/WaterFountain