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

Conflicts:
	FlashyCardies/res/drawable-mdpi/home_border.xml