image edit
edit html
delete console log
photo
photoedit
photo
Merge branch 'master' of https://github.com/illil/jaydi-songdam into illil-master

Conflicts:
	.DS_Store
	public/.DS_Store