Bird classes being implemented
Bird classes being written.
Merge remote-tracking branch 'origin/beta' into beta

Conflicts:
	ShooterSwag/bin/AndroidManifest.xml
	ShooterSwag/bin/classes/edu/pacificu/cs/duckhunter/DuckHunterMain.class
	ShooterSwag/bin/classes/edu/pacificu/cs/duckhunter/R$attr.class
	ShooterSwag/bin/classes/edu/pacificu/cs/duckhunter/R$color.class
	ShooterSwag/bin/classes/edu/pacificu/cs/duckhunter/R$drawable.class
	ShooterSwag/bin/classes/edu/pacificu/cs/duckhunter/R$id.class
	ShooterSwag/bin/classes/edu/pacificu/cs/duckhunter/R$layout.class
	ShooterSwag/bin/classes/edu/pacificu/cs/duckhunter/R$string.class
	ShooterSwag/bin/classes/edu/pacificu/cs/duckhunter/R$style.class
	ShooterSwag/bin/classes/edu/pacificu/cs/duckhunter/R$styleable.class
	ShooterSwag/bin/classes/edu/pacificu/cs/duckhunter/R.class
	ShooterSwag/gen/edu/pacificu/cs/duckhunter/R.java
	ShooterSwag/res/layout/activity_duck_hunter_main.xml
	ShooterSwag/res/values-v11/styles.xml
	ShooterSwag/res/values/strings.xml
	ShooterSwag/src/edu/pacificu/cs/duckhunter/GameActivity.java