-
rm csv
Merge branch 'master' of github.com:baardev/btcchart

Conflicts:
	img/b BTC bal (BlockChain).png
	img/b BTC bal (MtGox).png
	img/b BTC bal (Vicurex).png
	img/b DVC bal (Vicurex).png
	img/b LTC bal (Vicurex).png
	img/b NMC bal (Vicurex).png
	img/b PPC bal (Vicurex).png
	img/b TOT bal.png
	img/b TRC bal (Vicurex).png
	img/b USD bal (MtGox).png
	img/c BTC COINS from BlockChain.png
	img/c BTC Coins from MtGox.png
	img/c BTC Coins from Vicurex.png
	img/c DVC Coins from Vicurex.png
	img/c LTC Coins from Vicurex.png
	img/c NMC Coins from Vicurex.png
	img/c PPC Coins from Vicurex.png
	img/c TRC Coins from Vicurex.png
	img/out.jpg
	img/s BTC price from Vicurex.png
	img/s DVC price from Vicurex.png
	img/s LTC price from Vicurex.png
	img/s NMC price from Vicurex.png
	img/s PPC price from Vicurex.png
	img/s TRC price from Vicurex.png
	img/ztimestamp.png
	w3.csv
-
changes