new setup
new setup

Merge branch 'master' of https://github.com/simpleit961/code_android