first
fibonacci
nothing to say
1
1
1
1
1
add readme.md
add code  a adapter show two list
add intent filter test
Merge branch 'orgin'

Conflicts:
	AndroidManifest.xml
	bin/.gitignore
	bin/AndroidManifest.xml
	bin/Training.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/ff/training/activity/MainActivity.java
delete bin and gen
change work envirment
3

Signed-off-by: frankfancode <chinasdfxd@gmail.com>
A file was deleted
maybe this time will worked