logic structures
Merge branch 'master' of ssh://git@github.com/mwdchang/AndroidTest.git

Conflicts:
	src/com/daniel/demo2/ParticleScreen.java