ha
ha
ha
Merge branch 'master' of https://github.com/roytwQQ/captureNDHU

Conflicts:
	views/photos.ejs