Fixed AboutActivity.java and changed quitting of current activity when entering new one
Committing after merge
trying to xif reset
Merge branch 'master' of https://github.com/syqnew/Diversity into syqnew-master
merge
merging stephs changes
merge fixes
Merge branch 'ashleyjihye2-master1'
a
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