Config file committed
Merge branch 'master' of https://github.com/algosystech/pujaapp

Conflicts:
	WindowsFormsApplication1/App.config