fixed new images
deleted metal because it was repeated
hopefully works
Added logic for completing a character
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