commit for pulling
...
stuff
 Merge branch 'master' of https://github.com/maeorg/MoneyMagnet

Conflicts:
	bin/Debug/AppX/vs.appxrecipe