df
fjljf
Merge branch 'master' of https://github.com/MChesney/TrivialPursuit

Conflicts:
	BigDraw/src/edu/msu/cse/trivialpursuit/bigdraw/MainActivity.java
more color things
Merge branch 'master' of https://github.com/MChesney/TrivialPursuit

Conflicts:
	BigDraw/src/edu/msu/cse/trivialpursuit/bigdraw/DrawView.java
	BigDraw/src/edu/msu/cse/trivialpursuit/bigdraw/Drawing.java
	BigDraw/src/edu/msu/cse/trivialpursuit/bigdraw/MainActivity.java
Merge branch 'master' of https://github.com/MChesney/TrivialPursuit
color things