photo upload
Merge branch 'master' of https://github.com/descho/overpaintr

Conflicts:
	requirements.txt