Remote test, commented
Merge branch 'temp'

Conflicts:
	FlashyCardies/bin/classes/com/ramdev/flashycardies/Deck.class
	FlashyCardies/bin/classes/com/ramdev/flashycardies/EditDeck.class
	FlashyCardies/bin/classes/com/ramdev/flashycardies/Home.class
	FlashyCardies/bin/classes/com/ramdev/flashycardies/R$string.class
	FlashyCardies/gen/com/ramdev/flashycardies/R.java