Revert "aaaaaaaa"

This reverts commit a43a1cbe3237b51ebfb5b4f6c7eff71259584497.
Revert "Revert "aaaaaaaa""

This reverts commit 02a536e419aabe683512bcf3186be8781d4d3954.
aw geez
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hearts/bin/Hearts.apk
	Hearts/bin/classes.dex
	Hearts/bin/resources.ap_