Update ignore
Merge branch 'master' of git://github.com/csantanapr/dapp-examples.git

Conflicts:
	.gitignore