changed if/else if
Merge remote-tracking branch 'origin/master'

Conflicts:

	app/src/main/java/com/example/drunkinator/app/animation/GameAnimationView.java