Emma's stuff
Merge https://github.com/cheongchan/Combined_Webpage