Merge
Cindy Yen V1.1 with Blog/Portfolio page... loads of errors