add focusing on markers on create map
Merge branch 'master' of https://github.com/GoogleJump/Diversity
Merge branch 'master' of https://github.com/GoogleJump/Diversity
Merge branch 'master' of https://github.com/jennwu/Diversity into jennwu-master12
Fixed help.xml
merging
a
Merge branch 'jennwu-master12'
Merge pull request #69 from ashleyjihye4/master

Adding articles and making help.xml text look good
adding redirect to the main activity
adding redirect to the main activity
makes fonts consistent in textbuttons
Merge branch 'master' of https://github.com/clc4/Diversity into clc4-master12
a
Merge branch 'clc4-master12'
made small changes
resized images