changes made on friday

Signed-off-by: Cory Feitelson <cfeitelson@roovy.com>
Merge branch 'master' of https://github.com/feitelsonc/CatchPhrase

Signed-off-by: Cory Feitelson <cfeitelson@roovy.com>

Conflicts:
	src/com/cs185/catchphrase/TouchView2.java