Fixed error in merge.
Merge branch 'master' of https://github.com/murphy2902/FLashyCardy

Conflicts:
	FlashyCardies/res/drawable-mdpi/home_border.xml
Switched around write commands to master file.
asdfasdf
Merge branch 'master' of https://github.com/murphy2902/FlashyCardy

Conflicts:
	FlashyCardies/bin/classes/com/ramdev/flashycardies/Deck.class
	FlashyCardies/src/com/ramdev/flashycardies/Deck.java
postspringbreak
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