meh
fixed merge conflict
this stuff is not mine
Merge pull request #8 from Planxty-Dan/master

changed api class name
I made the main layout for our app yay
Merge pull request #9 from elyselturner/infoPageLayout

Info page layout
added druid fragment layout, setup view inflate and button views
Merge branch 'master' of github.com:TeamDruid/project_gift
I added the array temlpates for peoples search strings
Merge pull request #10 from elyselturner/ZodiacAttack

I added the array temlpates for peoples search strings
setting up onClick in Druid fragment
Merge branch 'master' of github.com:TeamDruid/project_gift
finished onClick for yes and no, need to add logic for what to do before starting API