ignore DS_Store
delete some useless thing..
 Please enter the commit message for your changes. Lines starting
Merge branch 'addblog'

Conflicts:
	.DS_Store
modify seeds.rb
update readme
normalize the comment time
Merge branch 'master' into photoupload
add root
Merge branch 'master' into photoupload
adjust style
Merge branch 'master' into photoupload
update readme
add gifs
update readme and add GIFs
update readme
update readme
Merge branch 'master' into photoupload

Conflicts:
	README.md
	sampleimg/.DS_Store