commit before sync
commit before sync2
idk what this is
xmls corrected
uncommitted that needs to be commited??
slight changes

challenge.txt challengeinput.txt remade their criteria. local.txt
reformatting
Merge remote-tracking branch 'origin/Chris'-Branch'

Conflicts:
	Game Generator/bin/edu/utdallas/gamegenerator/Search/SearchInput.class
	Game Generator/challenge.txt
	Game Generator/challengeInput.txt
	Game Generator/characters.txt
	Game Generator/input.txt
	Game Generator/locale.txt
	Game Generator/src/edu/utdallas/gamegenerator/Search/SearchInput.java