Merge pull request #24 from acdevine89/master

More stuff
small change to druid fragment
Merge branch 'master' of github.com:TeamDruid/project_gift

Conflicts:
	app/src/main/java/com/detroitlabs/teamdruid/project_gift/Fragments/Druid.java
change intents to pass to resultsactivity, added methods to zodiacArrays to get random search word, zodiac gets those search words now and that is what's passed through intent, fixed xml issues with interests
Merge pull request #25 from Planxty-Dan/master

Intents fixed, zodiac gets random search term, xml for interests fixed
Merge pull request #26 from acdevine89/master

Fixing string text in search_results.xml
Starting ResultsActivity onCreate get intents from fragments
Got ResultsActivity to pass argument to SearchResultsFragment
Renamed all the tags SEARCH_KEYWORD_TAG
Hooked up the SearchResultsFragment's search keyword to the EtsyAPI via EtsyAPI's constructor
fixed fragments to match main activity layout
fixed results fragment to tan background
Merge pull request #27 from Planxty-Dan/master

Fixing colors in layouts
Got everything working again--not everything, but on the way
Fixing merge conflicts
Merge pull request #29 from kyleofori/master

Please merge without problems
Adding stuff