Swiping plus main menu
swiping + main menu
Merge branch 'master' of https://github.com/jjing/121FinalProjectSpr14

Conflicts:
	MasterGravBot/ZombieBird/bin/com/kilobolt/ZBHelpers/AssetLoader.class
	MasterGravBot/ZombieBird/src/com/kilobolt/ZBHelpers/AssetLoader.java
Merge branch 'master' of https://github.com/jjing/121FinalProjectSpr14

Conflicts:
	MasterGravBot/ZombieBird-android/bin/ZombieBird-android.apk
	MasterGravBot/ZombieBird-android/bin/classes.dex
	MasterGravBot/ZombieBird-android/bin/resources.ap_