minor changes while going through code review
Merge branch 'master' of github.com:TeamDruid/project_gift
Merge branch 'master' of github.com:TeamDruid/project_gift
changed packages to lowercase
I changed package names and cleane up mainavtivity
minor changes to Druid to make cleaner
minor changes to EtsyAPI to make cleaner
I made changes to the main fragment yay
Merge pull request #35 from Planxty-Dan/master

check this out, lowercase packages
Merge branch 'ahhhhh' of github.com:elyselturner/project_gift into elyselturner-ahhhhh

Conflicts:
	app/src/main/java/com/detroitlabs/teamdruid/project_gift/Fragments/MainFragment.java
	app/src/main/java/com/detroitlabs/teamdruid/project_gift/parsers/JsonData.java
Merge branch 'elyselturner-ahhhhh'
Merge pull request #38 from Planxty-Dan/master

Merged with Elyse
Fixing spacing on import stuff