some formatting stuff
updating the text of the about to reflect myself being a team lead :p Lets be more profesional there peeps :P
undo layout changes since they seem to be messing up about page
fixed randomize
Don't quit SignUpOrLogInActivity
merges
murging Ashleys fix
Merge branch 'ashleyjihye2-master2'
a
adding artwork and formatting stuff
murging our amazing artwork
Merge branch 'clc2-master2'
committing to pull

Preparing to pull updates from Carolyn's artwork.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ParseStarterProject/.classpath
	ParseStarterProject/gen/com/parse/starter/R.java
	ParseStarterProject/src/com/parse/starter/MapActivity.java
just trying to rebase
Fixed the transition between activities

Added a temporary "loading" page between activities, and fade in/out
transitions