before reorgnize
reorgnize the files
Merge branch 'master' of https://github.com/meteorasd555/photo_meteor

Conflicts:
	photoWall.html