red and black tank icons
history controller connections (not loading correctly yet)
Merge branch 'master' of github.com:Destinycloudfist/vintage

Conflicts:
	Vintage/Vintage/BarrelStatusViewController.xib