eric testing push
Merge branch 'master' of https://github.com/a00880208/Android3717Project1