new gameover
new gameover
gitignore
new highscore layout and minor fixes
gitignore update
gitignore update
Merge branch 'master' of https://github.com/repat/FlappyCow

Conflicts:
	bin/R.txt
	bin/classes/com/quchen/flappycow/Cow.class
	bin/classes/com/quchen/flappycow/Game.class
	bin/classes/com/quchen/flappycow/GameOverScreen$1.class
	bin/classes/com/quchen/flappycow/GameOverScreen.class
	bin/classes/com/quchen/flappycow/GameView.class
	bin/classes/com/quchen/flappycow/MainActivity$2.class
	bin/classes/com/quchen/flappycow/MainActivity.class
	bin/classes/com/quchen/flappycow/PauseButton.class
	bin/classes/com/quchen/flappycow/R$drawable.class
	bin/classes/com/quchen/flappycow/R$id.class
	bin/classes/com/quchen/flappycow/R$integer.class
	bin/classes/com/quchen/flappycow/R$layout.class
	bin/classes/com/quchen/flappycow/R$menu.class
	bin/classes/com/quchen/flappycow/R$raw.class
	bin/classes/com/quchen/flappycow/R$string.class
	bin/classes/com/quchen/flappycow/R$style.class
	bin/classes/com/quchen/flappycow/R$styleable.class
	bin/classes/com/quchen/flappycow/Sprite.class
	bin/resources.ap_
	gen/com/quchen/flappycow/R.java
	res/layout/about.xml
	res/layout/gameover.xml
	res/values/strings.xml
	src/com/quchen/flappycow/Cow.java
	src/com/quchen/flappycow/GameOverScreen.java