Started working on time up dialog, have to commit because it would not let me pull.
Merge branch 'master' of github.com:feitelsonc/CatchPhrase

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