contact page added
Merge branch 'master' of https://github.com/zifeishan/emotif
random content added
Merge branch 'master' of https://github.com/zifeishan/emotif
merge before Zifei
Merge branch 'master' of https://github.com/zifeishan/emotif
New content page types added