scale test 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules.xml
Merge branch 'master' of https://github.com/davebuschmohle/WordScramble_BAD-MAC_1

Conflicts:
	.idea/vcs.xml
	app/src/main/res/layout/activity_main.xml
backgrounds