made stuff prett9er
Merge branch 'dev' of https://github.com/a00880208/Android3717Project1 into alex