Merge branch 'master' of https://github.com/calvinkleinwu/IST6213Project

Conflicts:
IMG_0790.jpg
app.js
image 2/1.jpg
image 2/2.jpg
image 2/3.jpg
image 2/4.jpg
image 2/5.jpg
image 2/6.jpg
image 2/7.jpg
images/IMG_0660.jpg
images/boat.png
images/chuck.png
images/copy_mcrepeatsalot.png
images/education.png
images/illustrator_foundations.png
images/library.png
images/refferal_machine.png
images/sebastian.png
images/skill-polish.png
images/space-juice.png
images/treehouse_shop.jpg
index.html
style.css
yingning.jpg
kkkk

kkkk