Adding some custom dialog boxes
Committing
fixing api key
strings
merge
Custom dialogs red background
fixed new images
deleted metal because it was repeated
fi
adding icons
Some more custom dialogs
Custom dialogs finished
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