temp commit
Merge branch 'master' of https://github.com/joshgould/palmTreePhotos

Conflicts:
	cloud/app.js