deployment
Merge branch 'master' of github.com:hou9o915/WaterfallPics
deploy
Merge branch 'master' of github.com:hou9o915/WaterfallPics

Conflicts:
	.gitignore
Merge branch 'master' of github.com:hou9o915/WaterfallPics

Conflicts:
	controller.py