Merge pull request #32 from vlee90/vincent-branch

Vincent branch
updates
Merge pull request #33 from malvinyeung/malvinbranch

updates
fixed bugs, added new pictures
Merge pull request #34 from vlee90/andrew-branch

fixed bugs, added new pictures
add photos and some semantics
add photos and some semantics
Merge pull request #35 from vlee90/malvinbranch

add photos and some semnatics
add user profile
fix merge conflict