fad
ignore bin and gen dir
ignore
Merge branch 'master' of github.com:weichangqing/FiveProject

Conflicts:
	src/com/example/achatengine/MainActivity.java
Merge remote-tracking branch 'first/master'

Conflicts:
	src/com/example/achatengine/Main6Activity.java