Merge pull request #4 from emrickgarrett/master

sdfasdgasgd
Merge pull request #4 from emrickgarrett/master

Update
Quick fix
Changes to some files
Merge branch 'master' of https://github.com/emrickgarrett/Team2CodeForGood
Merge pull request #7 from emrickgarrett/master

hhlep
Merge pull request #19 from mihirangal/master

sfdadfafasdf
Merge pull request #5 from emrickgarrett/master

sdfasfas
linked
Merge pull request #20 from brobinson09/master

added share and event page class
Merge pull request #21 from mihirangal/master

sadfjasldj
Small changes
Merge pull request #5 from emrickgarrett/master

Update to merge
Update Commit
Merge pull request #22 from brobinson09/master

Merge pull request #5 from emrickgarrett/master
Merge branch 'master' of https://github.com/brobinson09/Team2CodeForGood

Conflicts:
	Android/AndroidManifest.xml
	Android/src/com/example/handsonandroid/SplashActivity.java
Merge pull request #6 from emrickgarrett/master

Final splash
Merge pull request #23 from brobinson09/master

Conflict Killer
Conflict Resolved
Conflict Resolved