asd
:wq
:Wq
Merge branch 'master' of github.com:palumir/flickoff

Conflicts:
	FD/bin/FD.apk
	FD/bin/classes.dex
	FD/bin/classes/com/DJG/abilities/Coin.class
	FD/bin/classes/com/DJG/abilities/Nuke.class
	FD/bin/classes/com/DJG/abilities/Slow.class
	FD/bin/classes/com/DJG/abilities/Turret.class
	FD/bin/classes/com/DJG/fd/R$layout.class
	FD/bin/classes/com/DJG/fd/R$menu.class
	FD/bin/classes/com/DJG/fd/R$raw.class
	FD/bin/classes/com/DJG/fd/R$string.class
	FD/bin/classes/com/DJG/fd/R$styleable.class
	FD/bin/classes/com/DJG/fd/touchevents/TouchEvent.class
	FD/bin/classes/com/DJG/screenelements/ScreenElement.class
	FD/bin/classes/com/DJG/units/UnitType.class
	FD/bin/classes/com/DJG/waves/Survival.class
	FD/bin/resources.ap_
	appcompat_v7/bin/android-support-v7-appcompat.jar
asda