update data
update the photo with frineds photos
Merge branch 'master' of github.com:catch0822/2013F2AT

Conflicts:
	views/index.html
add user photo