Merge branch 'master' of github.com:TeamDruid/project_gift into debug
debugging
cleaning code in jsonData
Merge branch 'master' of github.com:TeamDruid/project_gift into debug

Conflicts:
	app/src/main/java/com/detroitlabs/teamdruid/project_gift/parsers/JsonData.java
fixed bug from my last emrge conflict, I messed it up.  I'm so sorry but it's better now.
Merge branch 'Planxty-Dan-master'