minor changes
Merge branch 'master' of https://github.com/zlei/flappy-pipe

Conflicts:
	bin/Flappy.apk
	bin/classes.dex
	bin/classes/com/zlei/flappypipe/MainActivity.class
	bin/classes/com/zlei/flappypipe/Obstacle.class
	bin/classes/com/zlei/flappypipe/QLearning.class
	src/com/zlei/flappypipe/MainActivity.java
	src/com/zlei/flappypipe/QLearning.java