IT's all good now!  Double chk to be sure.
Works!  Bugs gone, test to double check
Merge branch 'master' of git@github.com:cameronkeif/Project1.git

Conflicts:
	Scribbles/bin/Scribbles.apk
	Scribbles/bin/classes.dex
	Scribbles/bin/classes/edu/msu/cse/monopoly/scribbles/GuessActivity$1.class
	Scribbles/bin/classes/edu/msu/cse/monopoly/scribbles/GuessActivity$2.class
	Scribbles/bin/classes/edu/msu/cse/monopoly/scribbles/GuessActivity$3.class
	Scribbles/bin/classes/edu/msu/cse/monopoly/scribbles/GuessActivity$4.class
	Scribbles/bin/classes/edu/msu/cse/monopoly/scribbles/GuessActivity.class
	Scribbles/bin/dexedLibs/android-support-v4-3bffce5ae54ff248fcdf95d6398f55c8.jar
	Scribbles/bin/resources.ap_
	Scribbles/res/layout-land/activity_guess.xml
	Scribbles/src/edu/msu/cse/monopoly/scribbles/GuessActivity.java