second commit
Merge https://github.com/emilycup/emilycup.github.io