Updating my fork
fixed new images
deleted metal because it was repeated
hopefully works
Added logic for completing a character
merging awesome Ashleys dialogs
Merge branch 'ashleyjihye4-master6'
minor changes
Merge branch 'master' of https://github.com/jennwu/Diversity into jennwu-master

Conflicts:
	ParseStarterProject/.classpath
	ParseStarterProject/src/com/parse/starter/MapActivity.java
	ParseStarterProject/src/com/parse/starter/PickCharacterActivity.java
Merge branch 'jennwu-master'
Fixed formatting things
Changed name to SolveNGo
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ParseStarterProject/.classpath
Added Carolyn's new art work and resized images if necessary
Some picture clean up
Merge pull request #56 from syqnew/master

Added Carolyn's pictures