version 1

Aphrodite
delete previous work
version 2, Apollo
Merge branch 'Jiyang'