git commit -a
Merge branch 'master' of https://github.com/jaycee1967/VeganCoin

Conflicts:
	README.md
	VeganCoin-qt.pro
src/qt/res/images