I changed package names and cleane up mainavtivity
I made changes to the main fragment yay
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