List Views
ListViews added
Images
Merge branch 'master' of https://github.com/JordanPorter/Steam-Trading-App

Conflicts:
	bin/R.txt
	bin/SteamMarketTrader.apk
	bin/classes.dex
	bin/classes/android/support/v7/appcompat/R$color.class
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/smitteh/steammarkettrader/R$attr.class
	bin/classes/com/smitteh/steammarkettrader/R$bool.class
	bin/classes/com/smitteh/steammarkettrader/R$color.class
	bin/classes/com/smitteh/steammarkettrader/R$dimen.class
	bin/classes/com/smitteh/steammarkettrader/R$drawable.class
	bin/classes/com/smitteh/steammarkettrader/R$id.class
	bin/classes/com/smitteh/steammarkettrader/R$integer.class
	bin/classes/com/smitteh/steammarkettrader/R$layout.class
	bin/classes/com/smitteh/steammarkettrader/R$menu.class
	bin/classes/com/smitteh/steammarkettrader/R$string.class
	bin/classes/com/smitteh/steammarkettrader/R$style.class
	bin/classes/com/smitteh/steammarkettrader/R$styleable.class

	bin/classes/com/smitteh/steammarkettrader/Trader_Hub$PlaceholderFragment.class
	bin/classes/com/smitteh/steammarkettrader/Trader_Hub.class
	bin/jarlist.cache
	bin/resources.ap_
	gen/android/support/v7/appcompat/R.java
	gen/com/smitteh/steammarkettrader/R.java
	project.properties
	res/layout/activity_trader__hub.xml
	src/com/smitteh/steammarkettrader/Trader_Hub.java