Version 1.0 Ready
Merge branch 'master' of https://github.com/jonathanpeterwu/test_front_page

update is nescessary