test1
activity main
Delete test.txt
Merge pull request #1 from 787b/master

main activity