AAA

AAA
Merge remote-tracking branch 'origin/RRRRRRRRRR'

Conflicts:
	src/com/example/hearthstone/CardFragment.java